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.
This commit is contained in:
Richard Levitte 2003-10-29 06:21:22 +00:00
parent db59141467
commit 4e952ae4fc

View File

@ -91,20 +91,21 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
} }
} else { } else {
while (len >= AES_BLOCK_SIZE) { while (len >= AES_BLOCK_SIZE) {
memcpy(tmp, in, AES_BLOCK_SIZE);
AES_decrypt(in, out, key); AES_decrypt(in, out, key);
for(n=0; n < AES_BLOCK_SIZE; ++n) for(n=0; n < AES_BLOCK_SIZE; ++n)
out[n] ^= ivec[n]; out[n] ^= ivec[n];
memcpy(ivec, in, AES_BLOCK_SIZE); memcpy(ivec, tmp, AES_BLOCK_SIZE);
len -= AES_BLOCK_SIZE; len -= AES_BLOCK_SIZE;
in += AES_BLOCK_SIZE; in += AES_BLOCK_SIZE;
out += AES_BLOCK_SIZE; out += AES_BLOCK_SIZE;
} }
if (len) { if (len) {
memcpy(tmp, in, AES_BLOCK_SIZE); memcpy(tmp, in, AES_BLOCK_SIZE);
AES_decrypt(in, tmp, key); AES_decrypt(tmp, tmp, key);
for(n=0; n < len; ++n) for(n=0; n < len; ++n)
out[n] = tmp[n] ^ ivec[n]; out[n] = tmp[n] ^ ivec[n];
memcpy(ivec, in, AES_BLOCK_SIZE); memcpy(ivec, tmp, AES_BLOCK_SIZE);
} }
} }
} }