diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-16 22:43:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-16 22:43:09 -0500 |
| commit | 41bea71adc0d92b745cbedd454556cbdb52a4046 (patch) | |
| tree | fff1c5b746e3adc545b6db370fc383e474a8e1fa | |
| parent | c79957581e5d6c64fdae2be5b4d5a188ed18960a (diff) | |
| parent | b22568a54506e4b79b72530f89f21032e6435414 (diff) | |
| download | tor-41bea71adc0d92b745cbedd454556cbdb52a4046.tar.gz tor-41bea71adc0d92b745cbedd454556cbdb52a4046.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/197' into master
| -rw-r--r-- | src/lib/crypt_ops/compat_openssl.h | 3 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_openssl_mgt.c | 2 | ||||
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/crypt_ops/compat_openssl.h b/src/lib/crypt_ops/compat_openssl.h index c2e1459078..aa66e0c3fa 100644 --- a/src/lib/crypt_ops/compat_openssl.h +++ b/src/lib/crypt_ops/compat_openssl.h @@ -34,7 +34,7 @@ #ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) -#define OpenSSL_version_num() SSLeay() +#define tor_OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() #define STATE_IS_SW_SERVER_HELLO(st) \ (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ @@ -42,6 +42,7 @@ #define OSSL_HANDSHAKE_STATE int #define CONST_IF_OPENSSL_1_1_API #else /* defined(OPENSSL_1_1_API) */ +#define tor_OpenSSL_version_num() OpenSSL_version_num() #define STATE_IS_SW_SERVER_HELLO(st) \ ((st) == TLS_ST_SW_SRVR_HELLO) #define CONST_IF_OPENSSL_1_1_API const diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 065cbca1cc..e763491a11 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -222,7 +222,7 @@ crypto_openssl_early_init(void) setup_openssl_threading(); - unsigned long version_num = OpenSSL_version_num(); + unsigned long version_num = tor_OpenSSL_version_num(); const char *version_str = crypto_openssl_get_version_str(); if (version_num == OPENSSL_VERSION_NUMBER && !strcmp(version_str, OPENSSL_VERSION_TEXT)) { diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 2269714141..ad9b49ab4f 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -342,7 +342,7 @@ tor_tls_init(void) #if (SIZEOF_VOID_P >= 8 && \ OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) - long version = OpenSSL_version_num(); + long version = tor_OpenSSL_version_num(); /* LCOV_EXCL_START : we can't test these lines on the same machine */ if (version >= OPENSSL_V_SERIES(1,0,1)) { |