diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:23:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:23:27 -0400 |
| commit | e6d6347690d085dddb57d087a952750131b80758 (patch) | |
| tree | 2614c7be4357cebe43b669eefe62a0904777406a /src/common/aes.c | |
| parent | 01d729cbfe88e8a77b7bd42434e32771402f3fe7 (diff) | |
| parent | 89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c (diff) | |
| download | tor-e6d6347690d085dddb57d087a952750131b80758.tar.gz tor-e6d6347690d085dddb57d087a952750131b80758.zip | |
Merge remote-tracking branch 'public/bug26005_034'
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index a83a654348..f6b933374a 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -115,7 +115,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); |