Run util/openssl-format-source -v -c .

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

diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index 373864cd4bdb9cdf387d5d620e22361aed76b61e..dff5cd8df968440d2afbe37235912956207cff99 100644 (file)
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.

  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in


@@ -61,73 +61,74 @@
 
 #if !defined(OPENSSL_FIPS_AES_ASM)
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 
 #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) {
+                     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];
-       const unsigned char *iv = ivec;
+    unsigned long n;
+    unsigned long len = length;
+    unsigned char tmp[AES_BLOCK_SIZE];
+    const unsigned char *iv = ivec;

 
 

-       assert(in && out && key && ivec);
-       assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
+    assert(in && out && key && ivec);
+    assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));

 
 

-       if (AES_ENCRYPT == enc) {
-               while (len >= AES_BLOCK_SIZE) {
-                       for(n=0; n < AES_BLOCK_SIZE; ++n)
-                               out[n] = in[n] ^ iv[n];
-                       AES_encrypt(out, out, key);
-                       iv = out;
-                       len -= AES_BLOCK_SIZE;
-                       in += AES_BLOCK_SIZE;
-                       out += AES_BLOCK_SIZE;
-               }
-               if (len) {
-                       for(n=0; n < len; ++n)
-                               out[n] = in[n] ^ iv[n];
-                       for(n=len; n < AES_BLOCK_SIZE; ++n)
-                               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) {
-                       AES_decrypt(in, out, key);
-                       for(n=0; n < AES_BLOCK_SIZE; ++n)
-                               out[n] ^= iv[n];
-                       iv = in;
-                       len -= AES_BLOCK_SIZE;
-                       in  += AES_BLOCK_SIZE;
-                       out += AES_BLOCK_SIZE;
-               }
-               if (len) {
-                       AES_decrypt(in,tmp,key);
-                       for(n=0; n < len; ++n)
-                               out[n] = tmp[n] ^ iv[n];
-                       iv = in;
-               }
-               memcpy(ivec,iv,AES_BLOCK_SIZE);
-       } else {
-               while (len >= AES_BLOCK_SIZE) {
-                       memcpy(tmp, in, AES_BLOCK_SIZE);
-                       AES_decrypt(in, out, key);
-                       for(n=0; n < AES_BLOCK_SIZE; ++n)
-                               out[n] ^= ivec[n];
-                       memcpy(ivec, tmp, AES_BLOCK_SIZE);
-                       len -= AES_BLOCK_SIZE;
-                       in += AES_BLOCK_SIZE;
-                       out += AES_BLOCK_SIZE;
-               }
-               if (len) {
-                       memcpy(tmp, in, AES_BLOCK_SIZE);
-                       AES_decrypt(tmp, out, key);
-                       for(n=0; n < len; ++n)
-                               out[n] ^= ivec[n];
-                       for(n=len; n < AES_BLOCK_SIZE; ++n)
-                               out[n] = tmp[n];
-                       memcpy(ivec, tmp, AES_BLOCK_SIZE);
-               }
-       }
+    if (AES_ENCRYPT == enc) {
+        while (len >= AES_BLOCK_SIZE) {
+            for (n = 0; n < AES_BLOCK_SIZE; ++n)
+                out[n] = in[n] ^ iv[n];
+            AES_encrypt(out, out, key);
+            iv = out;
+            len -= AES_BLOCK_SIZE;
+            in += AES_BLOCK_SIZE;
+            out += AES_BLOCK_SIZE;
+        }
+        if (len) {
+            for (n = 0; n < len; ++n)
+                out[n] = in[n] ^ iv[n];
+            for (n = len; n < AES_BLOCK_SIZE; ++n)
+                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) {
+            AES_decrypt(in, out, key);
+            for (n = 0; n < AES_BLOCK_SIZE; ++n)
+                out[n] ^= iv[n];
+            iv = in;
+            len -= AES_BLOCK_SIZE;
+            in += AES_BLOCK_SIZE;
+            out += AES_BLOCK_SIZE;
+        }
+        if (len) {
+            AES_decrypt(in, tmp, key);
+            for (n = 0; n < len; ++n)
+                out[n] = tmp[n] ^ iv[n];
+            iv = in;
+        }
+        memcpy(ivec, iv, AES_BLOCK_SIZE);
+    } else {
+        while (len >= AES_BLOCK_SIZE) {
+            memcpy(tmp, in, AES_BLOCK_SIZE);
+            AES_decrypt(in, out, key);
+            for (n = 0; n < AES_BLOCK_SIZE; ++n)
+                out[n] ^= ivec[n];
+            memcpy(ivec, tmp, AES_BLOCK_SIZE);
+            len -= AES_BLOCK_SIZE;
+            in += AES_BLOCK_SIZE;
+            out += AES_BLOCK_SIZE;
+        }
+        if (len) {
+            memcpy(tmp, in, AES_BLOCK_SIZE);
+            AES_decrypt(tmp, out, key);
+            for (n = 0; n < len; ++n)
+                out[n] ^= ivec[n];
+            for (n = len; n < AES_BLOCK_SIZE; ++n)
+                out[n] = tmp[n];
+            memcpy(ivec, tmp, AES_BLOCK_SIZE);
+        }
+    }

 }
 #endif
 }
 #endif