diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-13 08:27:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-13 08:27:29 -0500 |
| commit | 42be1c668b9f8ec255afb307054e6388f478e837 (patch) | |
| tree | a8bcfefe4c12a4bf1a63249a150be5cbb914734e /src | |
| parent | 1fce9d129604ea25db4a697218e961c0dadf0133 (diff) | |
| parent | 54d1a2d80537e9f9a90dcca18c9e616f73809f58 (diff) | |
| download | tor-42be1c668b9f8ec255afb307054e6388f478e837.tar.gz tor-42be1c668b9f8ec255afb307054e6388f478e837.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index 49bb54762f..0c4f9b9bca 100644 --- a/src/common/aes.c +++ b/src/common/aes.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; |