Browse Source

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

Nick Mathewson 11 years ago
parent
commit
8f21838ee5
2 changed files with 4 additions and 1 deletions
  1. 3 0
      changes/bug8845
  2. 1 1
      src/test/test_crypto.c

+ 3 - 0
changes/bug8845

@@ -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.

+ 1 - 1
src/test/test_crypto.c

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