]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lib/sha1: use proper WORDS_BIGENDIAN macro
authorKarel Zak <kzak@redhat.com>
Tue, 2 Jan 2018 10:08:03 +0000 (11:08 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 2 Jan 2018 10:08:03 +0000 (11:08 +0100)
The original code uses BYTE_ORDER, but we use WORDS_BIGENDIAN in
utl-linux.

Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
lib/sha1.c

index e87677c073f6ba3f8b508b62969e9f2072b61e1b..22d33b3151216bad1beb7269f86338c6171d11d6 100644 (file)
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
 
 /* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#if BYTE_ORDER == LITTLE_ENDIAN
-# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
-#elif BYTE_ORDER == BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
 # define blk0(i) block->l[i]
 #else
-# error "Endianness not defined!"
+# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
 #endif
 
 #define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \