diff options
| author | dana koch <dsk@google.com> | 2015-12-24 18:54:29 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-07 12:48:59 -0800 |
| commit | be841f77aaa818f445d5b9a5e2eca6aa7ce4f0b6 (patch) | |
| tree | 84cc927b6223c6069fce55fd58d4a612126c2a37 /src | |
| parent | 62bc4a199a975a5cfe3891a59a0161f22906df1f (diff) | |
| download | tor-be841f77aaa818f445d5b9a5e2eca6aa7ce4f0b6.tar.gz tor-be841f77aaa818f445d5b9a5e2eca6aa7ce4f0b6.zip | |
Compatibility defines should be used for LibreSSL.
LibreSSL doesn't use OpenSSL_version (it uses the older SSLeay_version
API), but it reports a major version number as 2 in
OPENSSL_VERSION_NUMBER. Instead of fudging the version check, for now,
let's just check if we're using LibreSSL by checking the version number
macro exists, and use compatibility defines unconditionally when we
detect LibreSSL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat_openssl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 3fcd684c0c..5825ff7a4d 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -19,7 +19,8 @@ #error "We require OpenSSL >= 1.0.0" #endif -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) +#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) || \ + defined(LIBRESSL_VERSION_NUMBER) #define OPENSSL_VERSION SSLEAY_VERSION #define OpenSSL_version(v) SSLeay_version(v) #define OpenSSL_version_num() SSLeay() |