Build-n-link new IA-64 modules on Linux and HP-UX.

[oweals/openssl.git] / crypto / aes / aes_ctr.c

diff --git a/crypto/aes/aes_ctr.c b/crypto/aes/aes_ctr.c
index 5a1ced67f85fb91fefe91421601e352aee69bf7b..2487d83fb15cfd50e24c235306875da9e05c9ec3 100644 (file)
--- a/crypto/aes/aes_ctr.c
+++ b/crypto/aes/aes_ctr.c
@@ -59,7 +59,7 @@
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
-/* NOTE: CTR mode is big-endian.  The rest of the AES code
+/* NOTE: the IV/counter CTR mode is big-endian.  The rest of the AES code
  * is endian-neutral. */
 
 /* increment counter (128-bit int) by 1 */
@@ -67,61 +67,36 @@ static void AES_ctr128_inc(unsigned char *counter) {
        unsigned long c;
 
        /* Grab bottom dword of counter and increment */
-#ifdef L_ENDIAN
-       c = GETU32(counter +  0);
-       c++;
-       PUTU32(counter +  0, c);
-#else
        c = GETU32(counter + 12);
        c++;
        PUTU32(counter + 12, c);
-#endif
 
        /* if no overflow, we're done */
        if (c)
                return;
 
        /* Grab 1st dword of counter and increment */
-#ifdef L_ENDIAN
-       c = GETU32(counter +  4);
-       c++;
-       PUTU32(counter +  4, c);
-#else
        c = GETU32(counter +  8);
        c++;
        PUTU32(counter +  8, c);
-#endif
 
        /* if no overflow, we're done */
        if (c)
                return;
 
        /* Grab 2nd dword of counter and increment */
-#ifdef L_ENDIAN
-       c = GETU32(counter +  8);
-       c++;
-       PUTU32(counter +  8, c);
-#else
        c = GETU32(counter +  4);
        c++;
        PUTU32(counter +  4, c);
-#endif
 
        /* if no overflow, we're done */
        if (c)
                return;
 
        /* Grab top dword of counter and increment */
-#ifdef L_ENDIAN
-       c = GETU32(counter + 12);
-       c++;
-       PUTU32(counter + 12, c);
-#else
        c = GETU32(counter +  0);
        c++;
        PUTU32(counter +  0, c);
-#endif
-
 }
 
 /* The input encrypted as though 128bit counter mode is being
@@ -153,8 +128,8 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 
        while (l--) {
                if (n == 0) {
-                       AES_encrypt(counter, ecount_buf, key);
-                       AES_ctr128_inc(counter);
+                       AES_encrypt(ivec, ecount_buf, key);
+                       AES_ctr128_inc(ivec);
                }
                *(out++) = *(in++) ^ ecount_buf[n];
                n = (n+1) % AES_BLOCK_SIZE;