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 | |
| parent | 01d729cbfe88e8a77b7bd42434e32771402f3fe7 (diff) | |
| parent | 89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c (diff) | |
| download | tor-e6d6347690d085dddb57d087a952750131b80758.tar.gz tor-e6d6347690d085dddb57d087a952750131b80758.zip | |
Merge remote-tracking branch 'public/bug26005_034'
| -rw-r--r-- | src/common/aes.c | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 10 | ||||
| -rw-r--r-- | src/common/tortls.c | 4 | ||||
| -rw-r--r-- | src/test/test_tortls.c | 2 |
4 files changed, 9 insertions, 9 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); diff --git a/src/common/crypto.c b/src/common/crypto.c index 052f31723b..d5b7c96916 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -169,7 +169,7 @@ crypto_early_init(void) crypto_early_initialized_ = 1; -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#ifdef OPENSSL_1_1_API OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | @@ -1062,13 +1062,13 @@ crypto_dh_free_(crypto_dh_t *dh) int crypto_global_cleanup(void) { -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#ifndef OPENSSL_1_1_API EVP_cleanup(); #endif #ifndef NEW_THREAD_API ERR_remove_thread_state(NULL); #endif -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#ifndef OPENSSL_1_1_API ERR_free_strings(); #endif @@ -1082,13 +1082,13 @@ crypto_global_cleanup(void) dh_param_p = dh_param_p_tls = dh_param_g = NULL; #ifndef DISABLE_ENGINES -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#ifndef OPENSSL_1_1_API ENGINE_cleanup(); #endif #endif CONF_modules_unload(1); -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#ifndef OPENSSL_1_1_API CRYPTO_cleanup_all_ex_data(); #endif diff --git a/src/common/tortls.c b/src/common/tortls.c index 10b0319bec..669742c9dd 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -58,7 +58,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "container.h" #include <string.h> -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#ifdef OPENSSL_1_1_API #define X509_get_notBefore_const(cert) \ X509_get0_notBefore(cert) #define X509_get_notAfter_const(cert) \ @@ -372,7 +372,7 @@ tor_tls_init(void) check_no_tls_errors(); if (!tls_library_is_initialized) { -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#ifdef OPENSSL_1_1_API OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); #else SSL_library_init(); diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index ef1be139a6..ffa641ec41 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -205,7 +205,7 @@ test_tortls_tor_tls_get_error(void *data) static void library_init(void) { -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#ifdef OPENSSL_1_1_API OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); #else SSL_library_init(); |