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/tortls.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/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |