diff options
| author | teor <teor@torproject.org> | 2019-08-12 09:43:37 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-12 09:43:37 +1000 |
| commit | 2d4772dc47e6e7c43c3909540e73a139333fc7d6 (patch) | |
| tree | 11311634247c972460ae5d3156fe05f27371ec90 | |
| parent | ef345ab56d26e51f5d1f1a0b51e55a589465669b (diff) | |
| parent | 8c4e68438dd680b6b36f9b337b12d098b08db9d8 (diff) | |
| download | tor-2d4772dc47e6e7c43c3909540e73a139333fc7d6.tar.gz tor-2d4772dc47e6e7c43c3909540e73a139333fc7d6.zip | |
Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
| -rw-r--r-- | changes/bug30190 | 3 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_openssl_mgt.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug30190 b/changes/bug30190 new file mode 100644 index 0000000000..e2352c3b9c --- /dev/null +++ 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 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 " |