From 4e952ae4fc33a1c3a39e082dcb139c5560128ce8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 29 Oct 2003 06:21:22 +0000 Subject: [PATCH 1/1] Removing those memcpy()s also took away the possibility for in and out to be the same. Therefore, the removed memcpy()s need to be restored. --- crypto/aes/aes_cbc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c index 0a28ab8d34..1222a21002 100644 --- a/crypto/aes/aes_cbc.c +++ b/crypto/aes/aes_cbc.c @@ -91,20 +91,21 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, } } 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, in, AES_BLOCK_SIZE); + 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(in, tmp, key); + AES_decrypt(tmp, tmp, key); for(n=0; n < len; ++n) out[n] = tmp[n] ^ ivec[n]; - memcpy(ivec, in, AES_BLOCK_SIZE); + memcpy(ivec, tmp, AES_BLOCK_SIZE); } } } -- 2.34.1