tor

commit 9a1e633b27174f0ecc933fad3fbccbfb1c5f990a
parent 49110944d5adfceb6c93be4d8fc7efc59a35865e
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 24 Mar 2025 17:09:15 +0000

Merge branch 'openssl-dynamic-linking-warnings' into 'main'

Only include custom OpenSSL ABI checks for OpenSSL 1.1

See merge request tpo/core/tor!827
Diffstat:
M
src/lib/crypt_ops/crypto_openssl_mgt.c
 | 
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c
@@ -227,6 +227,7 @@ crypto_openssl_early_init(void)
 
     setup_openssl_threading();
 
+#ifdef OPENSSL_1_1_API
     unsigned long version_num = tor_OpenSSL_version_num();
     const char *version_str = crypto_openssl_get_version_str();
     if (version_num == OPENSSL_VERSION_NUMBER &&
@@ -248,6 +249,7 @@ crypto_openssl_early_init(void)
                (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,
                version_num, version_str);
     }
+#endif /* defined(OPENSSL_1_1_API) */
 
     crypto_force_rand_ssleay();
 }