Do not ask the user to pass either -DB_ENDIAN or -DL_ENDIAN to the compiler,

but rather figure out the endianness from <machine/endian.h> automagically;
help from guenther@

ok jca@ guenther@ beck@ and the rest of the `Buena SSL rampage club'

1 files changed, 5 insertions, 4 deletions

diff --git a/src/lib/libcrypto/whrlpool/wp_block.c b/src/lib/libcrypto/whrlpool/wp_block.c
index fadad01401..11164e50f5 100644
--- a/src/lib/libcrypto/whrlpool/wp_block.c
+++ b/src/lib/libcrypto/whrlpool/wp_block.c
@@ -37,6 +37,7 @@
 
 #include "wp_locl.h"
 #include <string.h>
+#include <machine/endian.h>
 
 typedef unsigned char           u8;
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32)
@@ -82,10 +83,10 @@ typedef unsigned long long	u64;
 #      define ROTATE(a,n)       ({ u64 ret; asm ("rolq %1,%0"   \
                                    : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
 #  elif defined(__ia64) || defined(__ia64__)
-#    if defined(L_ENDIAN)
+#    if _BYTE_ORDER == _LITTLE_ENDIAN
 #      define ROTATE(a,n)       ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
                                    : "=r"(ret) : "r"(a),"M"(64-(n))); ret; })
-#    elif defined(B_ENDIAN)
+#    else
 #      define ROTATE(a,n)       ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
                                    : "=r"(ret) : "r"(a),"M"(n)); ret; })
 #    endif
@@ -94,9 +95,9 @@ typedef unsigned long long	u64;
 
 #if defined(OPENSSL_SMALL_FOOTPRINT)
 #  if !defined(ROTATE)
-#    if defined(L_ENDIAN)       /* little-endians have to rotate left */
+#    if _BYTE_ORDER == _LITTLE_ENDIAN   /* little-endians have to rotate left */
 #      define ROTATE(i,n)       ((i)<<(n) ^ (i)>>(64-n))
-#    elif defined(B_ENDIAN)     /* big-endians have to rotate right */
+#    else                               /* big-endians have to rotate right */
 #      define ROTATE(i,n)       ((i)>>(n) ^ (i)<<(64-n))
 #    endif
 #  endif