From: Richard Levitte <levitte@openssl.org>
Date: Tue, 28 Dec 2004 10:35:13 +0000 (+0000)
Subject: iv needs to be const because it sometimes takes it's value from a
X-Git-Tag: OpenSSL_0_9_7g~17^2~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37b11ca78e4a5f71fc1558927a732a8783bb347a;p=thirdparty%2Fopenssl.git

iv needs to be const because it sometimes takes it's value from a
const.
---

diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index 41d538f2b52..f909aaf47a1 100644
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -65,7 +65,8 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 
 	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));
@@ -87,7 +88,7 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 				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) {
@@ -123,6 +124,6 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 			for(n=0; n < len; ++n)
 				out[n] = tmp[n] ^ ivec[n];
 			memcpy(ivec, tmp, AES_BLOCK_SIZE);
-		}			
+		}
 	}
 }