tor

commit 54d1a2d80537e9f9a90dcca18c9e616f73809f58
parent 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 13 Nov 2018 08:27:17 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

Diffstat:
A
changes/bug28413
 | 
4
++++
M
src/common/aes.c
 | 
5
++---

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/changes/bug28413 b/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.
diff --git a/src/common/aes.c b/src/common/aes.c
@@ -100,12 +100,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;
@@ -403,4 +403,3 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const uint8_t *iv)
 }
 
 #endif /* defined(USE_EVP_AES_CTR) */
-