aboutsummaryrefslogtreecommitdiff
path: root/src/common/aes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 13:33:14 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-03 13:33:14 -0400
commit89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c (patch)
treee8820cb54aca9e61ec9c9343e89d29943ead2570 /src/common/aes.c
parent5e0316142f14df890e34180dba087cd0264fba70 (diff)
downloadtor-89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c.tar.gz
tor-89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c.zip
Use OPENSSL_1_1_API in place of raw OPENSSL_VERSION_NUMBER checks
This is needed for libressl-2.6.4 compatibility, which we broke when we merged a15b2c57e1f901c53 to fix bug 19981. Fixes bug 26005; bug not in any released Tor.
Diffstat (limited to 'src/common/aes.c')
-rw-r--r--src/common/aes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 95737cffcc..efb4fe855c 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -116,7 +116,7 @@ aes_cipher_free_(aes_cnt_cipher_t *cipher_)
if (!cipher_)
return;
EVP_CIPHER_CTX *cipher = (EVP_CIPHER_CTX *) cipher_;
-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
+#ifdef OPENSSL_1_1_API
EVP_CIPHER_CTX_reset(cipher);
#else
EVP_CIPHER_CTX_cleanup(cipher);