Unverified Commit 2d4772dc authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5

parents ef345ab5 8c4e6843
o Minor bugfixes (lib):
do not log a warning for OpenSSL versions that should be compatible
Fixes bug 30190; bugfix on
......@@ -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)) {
"We compiled with OpenSSL %lx: %s and we "
"are running with OpenSSL %lx: %s. "
"These two versions should be binary compatible.",
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 "
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment