aboutsummaryrefslogtreecommitdiff
path: root/src/lib/crypt_ops
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-04-24 09:53:15 -0400
committerDavid Goulet <dgoulet@torproject.org>2019-04-24 09:53:15 -0400
commitf39dd0a7007d5152542ba5a493d7f25f1792b682 (patch)
treeb0d7eb5b3fa7003ffecf64286abc8d60541fe9d5 /src/lib/crypt_ops
parent608cf2ba8d48f99d0d17ee528ec55080dbd8154c (diff)
parent8c4e68438dd680b6b36f9b337b12d098b08db9d8 (diff)
downloadtor-f39dd0a7007d5152542ba5a493d7f25f1792b682.tar.gz
tor-f39dd0a7007d5152542ba5a493d7f25f1792b682.zip
Merge branch 'tor-github/pr/951'
Diffstat (limited to 'src/lib/crypt_ops')
-rw-r--r--src/lib/crypt_ops/crypto_openssl_mgt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c
index 60e4ea795e..c97815f9a4 100644
--- 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 "