Moved ROTL64 macro to macros.h.

8149d146 · Niels Möller · d20990fd · 8149d146 · 8149d146 · 8149d146
Commit 8149d146 authored Nov 12, 2012 by Niels Möller
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

ChangeLog ChangeLog +3 -0

macros.h macros.h +3 -1

sha512-compress.c sha512-compress.c +0 -2

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 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 ...

--- a/macros.h
+++ b/macros.h
@@ -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)			\

--- a/sha512-compress.c
+++ b/sha512-compress.c
@@ -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. */