Sync CRYPTOPP_{BIG|LITTLE}_ENDIAN with Autotools

Autotools sets up its config.h file with the '#define XXX 0' or '#define XXX 1' pattern. This check-in makes the sources Autotools aware. We need to verify CMake does the same

Author: noloader

adv-simd.h

@@ -112,7 +112,7 @@ inline size_t AdvancedProcessBlocks64_6x2_NEON(F2 func2, F6 func6,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 8);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_t s_one = {0, 0, 0, 1<<24};
     const uint32x4_t s_two = {0, 2<<24, 0, 2<<24};
 #else
@@ -357,7 +357,7 @@ inline size_t AdvancedProcessBlocks128_6x1_NEON(F1 func1, F6 func6,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 16);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_t s_one = {0, 0, 0, 1<<24};
     const uint32x4_t s_two = {0, 2<<24, 0, 2<<24};
 #else
@@ -520,7 +520,7 @@ inline size_t AdvancedProcessBlocks128_4x1_NEON(F1 func1, F4 func4,
     CRYPTOPP_ASSERT(length >= 16);
     CRYPTOPP_UNUSED(unused);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_t s_one = {0, 0, 0, 1<<24};
     const uint32x4_t s_two = {0, 2<<24, 0, 2<<24};
 #else
@@ -660,7 +660,7 @@ inline size_t AdvancedProcessBlocks128_6x2_NEON(F2 func2, F6 func6,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 16);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_t s_one = {0, 0, 0, 1<<24};
     const uint32x4_t s_two = {0, 2<<24, 0, 2<<24};
 #else
@@ -1806,7 +1806,7 @@ inline size_t AdvancedProcessBlocks64_6x2_ALTIVEC(F2 func2, F6 func6,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 8);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     enum {LowOffset=8, HighOffset=0};
     const uint32x4_p s_one  = {1,0,0,0};
     const uint32x4_p s_two  = {2,0,2,0};
@@ -2077,7 +2077,7 @@ inline size_t AdvancedProcessBlocks128_4x1_ALTIVEC(F1 func1, F4 func4,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 16);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_p s_one  = {1,0,0,0};
 #else
     const uint32x4_p s_one = {0,0,0,1};
@@ -2222,7 +2222,7 @@ inline size_t AdvancedProcessBlocks128_6x1_ALTIVEC(F1 func1, F6 func6,
     CRYPTOPP_ASSERT(outBlocks);
     CRYPTOPP_ASSERT(length >= 16);
 
-#if defined(CRYPTOPP_LITTLE_ENDIAN)
+#if (CRYPTOPP_LITTLE_ENDIAN)
     const uint32x4_p s_one  = {1,0,0,0};
 #else
     const uint32x4_p s_one = {0,0,0,1};

aria.cpp

@@ -291,7 +291,7 @@ void ARIA::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, b
 	else
 #endif  // CRYPTOPP_ENABLE_ARIA_SSSE3_INTRINSICS
 
-#ifdef CRYPTOPP_LITTLE_ENDIAN
+#if (CRYPTOPP_LITTLE_ENDIAN)
 	{
 		outBlock[ 0] = (byte)(X1[ARIA_BRF(t[0],3)]   ) ^ rk[ 3];
 		outBlock[ 1] = (byte)(X2[ARIA_BRF(t[0],2)]>>8) ^ rk[ 2];

camellia.cpp

@@ -60,7 +60,7 @@ NAMESPACE_BEGIN(CryptoPP)
 	ROUND(lh, ll, rh, rl, k0, k1)						\
 	ROUND(rh, rl, lh, ll, k2, k3)
 
-#ifdef CRYPTOPP_LITTLE_ENDIAN
+#if (CRYPTOPP_LITTLE_ENDIAN)
 #define EFI(i) (1-(i))
 #else
 #define EFI(i) (i)

config.h

@@ -9,23 +9,24 @@
 // ***************** Important Settings ********************
 
 // define this if running on a big-endian CPU
+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
 #if !defined(CRYPTOPP_LITTLE_ENDIAN) && !defined(CRYPTOPP_BIG_ENDIAN) && (defined(__BIG_ENDIAN__) || (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || (defined(__m68k__) || defined(__MC68K__)) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
 #	define CRYPTOPP_BIG_ENDIAN 1
 #endif
 
 // define this if running on a little-endian CPU
-// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not defined
+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
 #if !defined(CRYPTOPP_BIG_ENDIAN) && !defined(CRYPTOPP_LITTLE_ENDIAN)
 #	define CRYPTOPP_LITTLE_ENDIAN 1
 #endif
 
 // Sanity checks. Some processors have more than big, little and bi-endian modes. PDP mode, where order results in "4312", should
 // raise red flags immediately. Additionally, mis-classified machines, like (previosuly) S/390, should raise red flags immediately.
-#if defined(CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
-# error "CRYPTOPP_BIG_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_BIG_ENDIAN__"
+#if (CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
+# error "(CRYPTOPP_BIG_ENDIAN) is set, but __BYTE_ORDER__ is not __ORDER_BIG_ENDIAN__"
 #endif
-#if defined(CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-# error "CRYPTOPP_LITTLE_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_LITTLE_ENDIAN__"
+#if (CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
+# error "(CRYPTOPP_LITTLE_ENDIAN) is set, but __BYTE_ORDER__ is not __ORDER_LITTLE_ENDIAN__"
 #endif
 
 // Define this if you want to disable all OS-dependent features,
@@ -606,7 +607,7 @@ NAMESPACE_END
 
 // We don't have an ARM big endian test rig. Disable
 // ARM-BE ASM and instrinsics until we can test it.
-#if defined(CRYPTOPP_BIG_ENDIAN)
+#if (CRYPTOPP_BIG_ENDIAN)
 # define CRYPTOPP_DISABLE_ASM 1
 #endif
 

crc.cpp

@@ -21,7 +21,7 @@ extern void CRC32C_Update_SSE42(const byte *s, size_t n, word32& c);
 
 /* Table of CRC-32's of all single byte values (made by makecrc.c) */
 const word32 CRC32::m_tab[] = {
-#ifdef CRYPTOPP_LITTLE_ENDIAN
+#if (CRYPTOPP_LITTLE_ENDIAN)
 	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
 	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
 	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
@@ -189,7 +189,7 @@ void CRC32::TruncatedFinal(byte *hash, size_t size)
 // Castagnoli CRC32C (iSCSI)
 
 const word32 CRC32C::m_tab[] = {
-#ifdef CRYPTOPP_LITTLE_ENDIAN
+#if (CRYPTOPP_LITTLE_ENDIAN)
     0x00000000L, 0xf26b8303L, 0xe13b70f7L, 0x1350f3f4L, 0xc79a971fL,
     0x35f1141cL, 0x26a1e7e8L, 0xd4ca64ebL, 0x8ad958cfL, 0x78b2dbccL,
     0x6be22838L, 0x9989ab3bL, 0x4d43cfd0L, 0xbf284cd3L, 0xac78bf27L,

crc.h

@@ -12,7 +12,7 @@ NAMESPACE_BEGIN(CryptoPP)
 
 const word32 CRC32_NEGL = 0xffffffffL;
 
-#ifdef CRYPTOPP_LITTLE_ENDIAN
+#if (CRYPTOPP_LITTLE_ENDIAN)
 #define CRC32_INDEX(c) (c & 0xff)
 #define CRC32_SHIFTED(c) (c >> 8)
 #else

gcm-simd.cpp

@@ -191,7 +191,7 @@ using CryptoPP::VectorRotateLeft;
 
 inline uint64x2_p VMULL2LE(const uint64x2_p& val)
 {
-#if CRYPTOPP_BIG_ENDIAN
+#if (CRYPTOPP_BIG_ENDIAN)
     return VectorRotateLeft<8>(val);
 #else
     return val;
@@ -776,7 +776,7 @@ inline uint64x2_p GCM_Multiply_VMULL(uint64x2_p x, uint64x2_p h, uint64x2_p r)
 
 inline uint64x2_p LoadHashKey(const byte *hashKey)
 {
-#if CRYPTOPP_BIG_ENDIAN
+#if (CRYPTOPP_BIG_ENDIAN)
     const uint64x2_p key = (uint64x2_p)VectorLoad(hashKey);
     const uint8x16_p mask = {8,9,10,11, 12,13,14,15, 0,1,2,3, 4,5,6,7};
     return vec_perm(key, key, mask);
@@ -825,7 +825,7 @@ inline T SwapWords(const T& data)
 
 inline uint64x2_p LoadBuffer1(const byte *dataBuffer)
 {
-#if CRYPTOPP_BIG_ENDIAN
+#if (CRYPTOPP_BIG_ENDIAN)
     return (uint64x2_p)VectorLoad(dataBuffer);
 #else
     const uint64x2_p data = (uint64x2_p)VectorLoad(dataBuffer);
@@ -836,7 +836,7 @@ inline uint64x2_p LoadBuffer1(const byte *dataBuffer)
 
 inline uint64x2_p LoadBuffer2(const byte *dataBuffer)
 {
-#if CRYPTOPP_BIG_ENDIAN
+#if (CRYPTOPP_BIG_ENDIAN)
     return (uint64x2_p)SwapWords(VectorLoadBE(dataBuffer));
 #else
     return (uint64x2_p)VectorLoadBE(dataBuffer);

gcm.cpp

@@ -438,7 +438,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
 
             #define READ_TABLE_WORD64_COMMON(a, b, c, d)    *(word64 *)(void *)(mulTable+(a*1024)+(b*256)+c+d*8)
 
-            #ifdef CRYPTOPP_LITTLE_ENDIAN
+            #if (CRYPTOPP_LITTLE_ENDIAN)
                 #if CRYPTOPP_BOOL_SLOW_WORD64
                     word32 z0 = (word32)x0;
                     word32 z1 = (word32)(x0>>32);
@@ -509,7 +509,7 @@ size_t GCM_Base::AuthenticateBlocks(const byte *data, size_t len)
 
             #define READ_TABLE_WORD64_COMMON(a, c, d)    *(word64 *)(void *)(mulTable+(a)*256*16+(c)+(d)*8)
 
-            #ifdef CRYPTOPP_LITTLE_ENDIAN
+            #if (CRYPTOPP_LITTLE_ENDIAN)
                 #if CRYPTOPP_BOOL_SLOW_WORD64
                     word32 z0 = (word32)x0;
                     word32 z1 = (word32)(x0>>32);

integer.cpp

@@ -285,7 +285,7 @@ class DWord
 #endif
 	{
 #if defined(CRYPTOPP_NATIVE_DWORD_AVAILABLE)
-#  if defined(CRYPTOPP_LITTLE_ENDIAN)
+#  if (CRYPTOPP_LITTLE_ENDIAN)
 		const word t[2] = {low,high};
 		memcpy(&m_whole, t, sizeof(m_whole));
 #  else
@@ -390,7 +390,7 @@ class DWord
 	//   Thanks to Martin Bonner at http://stackoverflow.com/a/39507183
     struct half_words
     {
-    #ifdef CRYPTOPP_LITTLE_ENDIAN
+    #if (CRYPTOPP_LITTLE_ENDIAN)
         word low;
         word high;
     #else

kalyna.cpp

@@ -43,7 +43,7 @@ using CryptoPP::KalynaTab::IS;
 template <unsigned int NB>
 inline void MakeOddKey(const word64 evenkey[NB], word64 oddkey[NB])
 {
-#if defined(CRYPTOPP_BIG_ENDIAN)
+#if (CRYPTOPP_BIG_ENDIAN)
     if (NB == 2)
     {
         oddkey[0] = (evenkey[1] << 8) | (evenkey[0] >> 56);