diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-02 08:26:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-02 08:26:49 -0400 |
| commit | bf3e899dcef368a021033c6845b93c08884dae02 (patch) | |
| tree | 700dfbff69aafea78afd5d9d3dd64945e965551b /src/common | |
| parent | b116710e313c6debf9bc172e462837782def57bd (diff) | |
| parent | 75f3fbaa3c7316fcef3509ef1e3813b94d8c4c8a (diff) | |
| download | tor-bf3e899dcef368a021033c6845b93c08884dae02.tar.gz tor-bf3e899dcef368a021033c6845b93c08884dae02.zip | |
Merge branch 'libressl_201805_029' into 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() |