tor

commit f39dd0a7007d5152542ba5a493d7f25f1792b682
parent 608cf2ba8d48f99d0d17ee528ec55080dbd8154c
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 24 Apr 2019 09:53:15 -0400

Merge branch 'tor-github/pr/951'

Diffstat:
A
changes/bug30190
 | 
3
+++
M
src/lib/crypt_ops/crypto_openssl_mgt.c
 | 
8
++++++++

2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/changes/bug30190 b/changes/bug30190
@@ -0,0 +1,3 @@
+  o Minor bugfixes (lib):
+    do not log a warning for OpenSSL versions that should be compatible
+    Fixes bug 30190; bugfix on 0.2.4.2-alpha
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c
@@ -213,6 +213,14 @@ crypto_openssl_early_init(void)
         !strcmp(version_str, OPENSSL_VERSION_TEXT)) {
       log_info(LD_CRYPTO, "OpenSSL version matches version from headers "
                  "(%lx: %s).", version_num, version_str);
+    } else if ((version_num & 0xffff0000) ==
+               (OPENSSL_VERSION_NUMBER & 0xffff0000)) {
+      log_notice(LD_CRYPTO,
+               "We compiled with OpenSSL %lx: %s and we "
+               "are running with OpenSSL %lx: %s. "
+               "These two versions should be binary compatible.",
+               (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT,
+               version_num, version_str);
     } else {
       log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the "
                "version we're running with. If you get weird crashes, that "