diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-05-31 09:07:45 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-05-31 09:07:45 -0400 |
| commit | 925201c946accdc322279f09b311326479d5461c (patch) | |
| tree | 2175ba30389c1e755a2a7b3c4e413dc6bbfd0d43 | |
| parent | 415c0354b2e495f236ddf8f67accb3cba4249e21 (diff) | |
| parent | 9850dc59c0db5cbcadc314be8d324a992880fce1 (diff) | |
| download | tor-925201c946accdc322279f09b311326479d5461c.tar.gz tor-925201c946accdc322279f09b311326479d5461c.zip | |
Merge branch 'tor-gitlab/mr/713'
| -rw-r--r-- | src/lib/tls/tortls_openssl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 12260c09d3..c0a89ac272 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -340,8 +340,10 @@ tor_tls_init(void) SSL_load_error_strings(); #endif /* defined(OPENSSL_1_1_API) */ -#if (SIZEOF_VOID_P >= 8 && \ - OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) +#if (SIZEOF_VOID_P >= 8 && \ + OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1) && \ + (!defined(LIBRESSL_VERSION_NUMBER) || \ + LIBRESSL_VERSION_NUMBER < 0x3080000fL)) long version = tor_OpenSSL_version_num(); /* LCOV_EXCL_START : we can't test these lines on the same machine */ |