diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:04:37 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:04:37 -0500 |
| commit | c6fb26695b1b84b287cc641f7bfaaaba32b67cde (patch) | |
| tree | e5377731ac42df90ec56b8a831c8eb153a2ee081 /src/lib/crypt_ops/crypto_openssl_mgt.c | |
| parent | 3ebf75993f8c64ea0bc022bde69ccdf879bcaeaf (diff) | |
| parent | c48d25ac8d5cb8320a56a61cbee7754420d77309 (diff) | |
| download | tor-c6fb26695b1b84b287cc641f7bfaaaba32b67cde.tar.gz tor-c6fb26695b1b84b287cc641f7bfaaaba32b67cde.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
Diffstat (limited to 'src/lib/crypt_ops/crypto_openssl_mgt.c')
| -rw-r--r-- | src/lib/crypt_ops/crypto_openssl_mgt.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index c97815f9a4..e7d6084f6c 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -101,13 +101,22 @@ static char *crypto_openssl_version_str = NULL; const char * crypto_openssl_get_version_str(void) { +#ifdef OPENSSL_VERSION + const int query = OPENSSL_VERSION; +#else + /* This old name was changed around OpenSSL 1.1.0 */ + const int query = SSLEAY_VERSION; +#endif + if (crypto_openssl_version_str == NULL) { - const char *raw_version = OpenSSL_version(OPENSSL_VERSION); + const char *raw_version = OpenSSL_version(query); crypto_openssl_version_str = parse_openssl_version_str(raw_version); } return crypto_openssl_version_str; } +#undef QUERY_OPENSSL_VERSION + static char *crypto_openssl_header_version_str = NULL; /* Return a human-readable version of the compile-time openssl version * number. */ @@ -208,7 +217,7 @@ crypto_openssl_early_init(void) setup_openssl_threading(); unsigned long version_num = OpenSSL_version_num(); - const char *version_str = OpenSSL_version(OPENSSL_VERSION); + const char *version_str = crypto_openssl_get_version_str(); if (version_num == OPENSSL_VERSION_NUMBER && !strcmp(version_str, OPENSSL_VERSION_TEXT)) { log_info(LD_CRYPTO, "OpenSSL version matches version from headers " |