commit 5e77bd449e9d7050d59271db157e3fc8957e23e9
author David Benjamin <davidben@chromium.org> Tue Sep 30 19:47:35 2014 -0400
committer Adam Langley <agl@google.com> Wed Oct 01 02:06:31 2014 +0000
tree de26b566b6b66814af96c54d007f585660e6c9c8
parent 04284b895279667ea1ac8f1f98d2ef0598c6adb9

Use OPENSSL_64_BIT in rc4.c.

This avoids unnecessary differences between LP64 and LLP64. Also
MSVC throws overflow warnings in the big-endian 64-bit codepath,
so use the preprocessor.

Change-Id: I74cef2d631d39f282177e043ed24bc6ecbbcb8fd
Reviewed-on: https://boringssl-review.googlesource.com/1860
Reviewed-by: Adam Langley <agl@google.com>

crypto/rc4/rc4.c

diff --git a/crypto/rc4/rc4.c b/crypto/rc4/rc4.c
index 4fc8b6b..00b59c8 100644
--- a/crypto/rc4/rc4.c
+++ b/crypto/rc4/rc4.c
@@ -56,11 +56,17 @@
 
 #include <openssl/rc4.h>
 
-
 #if defined(OPENSSL_NO_ASM) || \
     (!defined(OPENSSL_X86_64) && !defined(OPENSSL_X86))
 
-#define RC4_CHUNK unsigned long
+#if defined(OPENSSL_64_BIT)
+#define RC4_CHUNK uint64_t
+#elif defined(OPENSSL_32_BIT)
+#define RC4_CHUNK uint32_t
+#else
+#error "Unknown word size"
+#endif
+
 #define RC4_INT uint32_t
 
 
@@ -157,12 +163,12 @@
         otp |= RC4_STEP << BESHFT(1);
         otp |= RC4_STEP << BESHFT(2);
         otp |= RC4_STEP << BESHFT(3);
-        if (sizeof(RC4_CHUNK) == 8) {
-          otp |= RC4_STEP << BESHFT(4);
-          otp |= RC4_STEP << BESHFT(5);
-          otp |= RC4_STEP << BESHFT(6);
-          otp |= RC4_STEP << BESHFT(7);
-        }
+#if defined(OPENSSL_64_BIT)
+        otp |= RC4_STEP << BESHFT(4);
+        otp |= RC4_STEP << BESHFT(5);
+        otp |= RC4_STEP << BESHFT(6);
+        otp |= RC4_STEP << BESHFT(7);
+#endif
         *(RC4_CHUNK *)out = otp ^ ichunk;
         in += sizeof(RC4_CHUNK);
         out += sizeof(RC4_CHUNK);
@@ -206,12 +212,12 @@
         otp |= RC4_STEP << 8;
         otp |= RC4_STEP << 16;
         otp |= RC4_STEP << 24;
-        if (sizeof(RC4_CHUNK) == 8) {
-          otp |= RC4_STEP << LESHFT(4);
-          otp |= RC4_STEP << LESHFT(5);
-          otp |= RC4_STEP << LESHFT(6);
-          otp |= RC4_STEP << LESHFT(7);
-        }
+#if defined(OPENSSL_64_BIT)
+        otp |= RC4_STEP << LESHFT(4);
+        otp |= RC4_STEP << LESHFT(5);
+        otp |= RC4_STEP << LESHFT(6);
+        otp |= RC4_STEP << LESHFT(7);
+#endif
         *(RC4_CHUNK *)out = otp ^ ichunk;
         in += sizeof(RC4_CHUNK);
         out += sizeof(RC4_CHUNK);