nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/951'

Browse Source
This commit is contained in:
David Goulet 2019-04-24 09:53:15 -04:00
commit f39dd0a700
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug30190 Normal file
View File

@ -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

8
src/lib/crypt_ops/crypto_openssl_mgt.c
View File

@ -213,6 +213,14 @@ crypto_openssl_early_init(void)
!strcmp(version_str, OPENSSL_VERSION_TEXT)) { !strcmp(version_str, OPENSSL_VERSION_TEXT)) {
log_info(LD_CRYPTO, "OpenSSL version matches version from headers " log_info(LD_CRYPTO, "OpenSSL version matches version from headers "
"(%lx: %s).", version_num, version_str); "(%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 { } else {
log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the " log_warn(LD_CRYPTO, "OpenSSL version from headers does not match the "
"version we're running with. If you get weird crashes, that " "version we're running with. If you get weird crashes, that "