aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypt_ops
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-13 08:27:29 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-13 08:27:29 -0500
commitd000e798acce374225ead0bd074169ad611bf001 (patch)
tree803cf38a5fa7f9e37610072d66e0cae98cd07546 /src/lib/crypt_ops
parentd1e9285b1de1f6ec94494196c6e2daf4e5c615c0 (diff)
parentae4c94bb6468078ba16de481991e781e1b486340 (diff)
downloadtor-d000e798acce374225ead0bd074169ad611bf001.tar.gz
tor-d000e798acce374225ead0bd074169ad611bf001.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/lib/crypt_ops')
-rw-r--r--src/lib/crypt_ops/aes_openssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c
index f2990fc06d..ac275af33c 100644
--- a/src/lib/crypt_ops/aes_openssl.c
+++ b/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;