Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dmitry Baryshkov
nettle
Commits
8149d146
Commit
8149d146
authored
Nov 12, 2012
by
Niels Möller
Browse files
Moved ROTL64 macro to macros.h.
parent
d20990fd
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
8149d146
2012-11-12 Niels Möller <nisse@lysator.liu.se>
* macros.h (ROTL64): New macro, moved from...
* sha512-compress.c (ROTL64): ... old location, deleted.
* serpent-internal.h [HAVE_NATIVE_64_BIT] (DROTL32): Renamed from...
(ROTL64): ... old name.
(DRSHIFT32): Renamed from ...
...
...
macros.h
View file @
8149d146
...
...
@@ -119,7 +119,9 @@ do { \
(dst) += (blocksize), \
(src) += (blocksize)) )
#define ROTL32(n,x) ((((x))<<(n)) | (((x))>>(32-(n))))
#define ROTL32(n,x) (((x)<<(n)) | ((x)>>(32-(n))))
#define ROTL64(n,x) (((x)<<(n)) | ((x)>>(64-(n))))
/* Requires that size >= 2 */
#define INCREMENT(size, ctr) \
...
...
sha512-compress.c
View file @
8149d146
...
...
@@ -38,8 +38,6 @@
/* A block, treated as a sequence of 64-bit words. */
#define SHA512_DATA_LENGTH 16
#define ROTL64(n,x) ((x)<<(n) | ((x)>>(64-(n))))
/* The SHA512 functions. The Choice function is the same as the SHA1
function f1, and the majority function is the same as the SHA1 f3
function, and the same as for SHA256. */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment