Browse Source

Merge branch 'maint-0.3.4' into maint-0.3.5

Nick Mathewson 5 years ago
parent
commit
ae4c94bb64
2 changed files with 6 additions and 2 deletions
  1. 4 0
      changes/bug28413
  2. 2 2
      src/lib/crypt_ops/aes_openssl.c

+ 4 - 0
changes/bug28413

@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Initialize a variable in aes_new_cipher(), since some compilers
+      cannot tell that we always initialize it before use. Fixes bug 28413;
+      bugfix on 0.2.9.3-alpha.

+ 2 - 2
src/lib/crypt_ops/aes_openssl.c

@@ -101,12 +101,12 @@ aes_cnt_cipher_t *
 aes_new_cipher(const uint8_t *key, const uint8_t *iv, int key_bits)
 {
   EVP_CIPHER_CTX *cipher = EVP_CIPHER_CTX_new();
-  const EVP_CIPHER *c;
+  const EVP_CIPHER *c = NULL;
   switch (key_bits) {
     case 128: c = EVP_aes_128_ctr(); break;
     case 192: c = EVP_aes_192_ctr(); break;
     case 256: c = EVP_aes_256_ctr(); break;
-    default: tor_assert(0); // LCOV_EXCL_LINE
+    default: tor_assert_unreached(); // LCOV_EXCL_LINE
   }
   EVP_EncryptInit(cipher, c, key, iv);
   return (aes_cnt_cipher_t *) cipher;