Merge remote-tracking branch 'origin/maint-0.2.4'

This commit is contained in:
Nick Mathewson 2013-05-08 13:01:58 -04:00
commit 8f21838ee5
2 changed files with 4 additions and 1 deletions

3
changes/bug8845 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (test):
- Fix an impossible buffer overrun in the AES unit tests. Fixes bug 8845;
bugfix on 0.2.0.7-alpha. Found by eugenis.

View File

@ -702,7 +702,7 @@ test_crypto_aes_iv(void *arg)
/* Decrypt with the wrong key. */ /* Decrypt with the wrong key. */
decrypted_size = crypto_cipher_decrypt_with_iv(key2, decrypted2, 4095, decrypted_size = crypto_cipher_decrypt_with_iv(key2, decrypted2, 4095,
encrypted1, encrypted_size); encrypted1, encrypted_size);
test_memneq(plain, decrypted2, encrypted_size); test_memneq(plain, decrypted2, decrypted_size);
/* Alter the initialization vector. */ /* Alter the initialization vector. */
encrypted1[0] += 42; encrypted1[0] += 42;
decrypted_size = crypto_cipher_decrypt_with_iv(key1, decrypted1, 4095, decrypted_size = crypto_cipher_decrypt_with_iv(key1, decrypted1, 4095,