Prepare for 0.9.8k release.

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

diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index e43135e8a022440dd10d58bae06147f40992f515..373864cd4bdb9cdf387d5d620e22361aed76b61e 100644 (file)
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -59,13 +59,15 @@
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
+#if !defined(OPENSSL_FIPS_AES_ASM)
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                     const unsigned long length, const AES_KEY *key,
                     unsigned char *ivec, const int enc) {
 
        unsigned long n;
        unsigned long len = length;
-       unsigned char tmp[AES_BLOCK_SIZE], *iv = ivec;
+       unsigned char tmp[AES_BLOCK_SIZE];
+       const unsigned char *iv = ivec;
 
        assert(in && out && key && ivec);
        assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
@@ -82,13 +84,12 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                }
                if (len) {
                        for(n=0; n < len; ++n)
-                               tmp[n] = in[n] ^ iv[n];
+                               out[n] = in[n] ^ iv[n];
                        for(n=len; n < AES_BLOCK_SIZE; ++n)
-                               tmp[n] = iv[n];
-                       AES_encrypt(tmp, tmp, key);
-                       memcpy(out, tmp, AES_BLOCK_SIZE);
+                               out[n] = iv[n];
+                       AES_encrypt(out, out, key);
                        iv = out;
-               }                       
+               }
                memcpy(ivec,iv,AES_BLOCK_SIZE);
        } else if (in != out) {
                while (len >= AES_BLOCK_SIZE) {
@@ -120,10 +121,13 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
                }
                if (len) {
                        memcpy(tmp, in, AES_BLOCK_SIZE);
-                       AES_decrypt(tmp, tmp, key);
+                       AES_decrypt(tmp, out, key);
                        for(n=0; n < len; ++n)
-                               out[n] = tmp[n] ^ ivec[n];
+                               out[n] ^= ivec[n];
+                       for(n=len; n < AES_BLOCK_SIZE; ++n)
+                               out[n] = tmp[n];
                        memcpy(ivec, tmp, AES_BLOCK_SIZE);
-               }                       
+               }
        }
 }
+#endif