diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:25:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:25:52 -0400 |
| commit | 9df20f60762dbd21796bb8c9c621585662e7f708 (patch) | |
| tree | 7134a05ad3b9882787158033c571ca8dd5ecbd39 /src/common | |
| parent | e6d6347690d085dddb57d087a952750131b80758 (diff) | |
| parent | a639a67844909bd05fadaea5c1847f5e9af55cde (diff) | |
| download | tor-9df20f60762dbd21796bb8c9c621585662e7f708.tar.gz tor-9df20f60762dbd21796bb8c9c621585662e7f708.zip | |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat_openssl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 1299ac36bb..d1481fb46c 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -9,6 +9,7 @@ #include <openssl/opensslv.h> #include "crypto_openssl_mgt.h" + /** * \file compat_openssl.h * @@ -27,8 +28,11 @@ #define OPENSSL_1_1_API #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ -#ifndef OPENSSL_1_1_API +#ifndef OPENSSL_VERSION #define OPENSSL_VERSION SSLEAY_VERSION +#endif + +#ifndef OPENSSL_1_1_API #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() #define RAND_OpenSSL() RAND_SSLeay() |