Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Core
Tor
Commits
2d4772dc
Unverified
Commit
2d4772dc
authored
Aug 12, 2019
by
teor
Browse files
Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
parents
ef345ab5
8c4e6843
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/bug30190
0 → 100644
View file @
2d4772dc
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
src/lib/crypt_ops/crypto_openssl_mgt.c
View file @
2d4772dc
...
...
@@ -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 "
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment