diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-10-15 09:00:14 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-10-15 09:00:14 +0000 |
| commit | 0b6956b4747e6f42427863f8a78f8939a86fb175 (patch) | |
| tree | e4cde871bf19dc1462fb91c7509e1e66533c50b7 /crypto/aes/aes_cbc.c | |
| parent | 0bb6187e71658fd691fe9f3b48a79a6250567216 (diff) | |
Correct serious bug in AES-CBC decryption when the message length isn't
a multiple of AES_BLOCK_SIZE.
Optimize decryption of all complete blocks in AES-CBC by removing an
unnecessary memcpy().
The error was notified by James Fernandes <jf210032@exchange.DAYTONOH.NCR.com>.
The unnecessary memcpy() was found as an effect of investigating that error.
Diffstat (limited to 'crypto/aes/aes_cbc.c')
| -rw-r--r-- | crypto/aes/aes_cbc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c index 86b27b10d6..0a28ab8d34 100644 --- a/crypto/aes/aes_cbc.c +++ b/crypto/aes/aes_cbc.c @@ -91,21 +91,20 @@ 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, tmp, AES_BLOCK_SIZE); + memcpy(ivec, in, 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, tmp, key); + AES_decrypt(in, tmp, key); for(n=0; n < len; ++n) - out[n] ^= ivec[n]; - memcpy(ivec, tmp, AES_BLOCK_SIZE); + out[n] = tmp[n] ^ ivec[n]; + memcpy(ivec, in, AES_BLOCK_SIZE); } } } |