nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/bug26152_035'

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-17 19:28:59 -04:00
commit 987174cc6f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug26152 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (testing):
- When logging a version mismatch in our openssl_version tests,
report the actual offending version strings. Fixes bug 26152; bugfix on
0.2.9.1-alpha.

9
src/test/test_crypto.c
View File

@ -152,8 +152,13 @@ test_crypto_openssl_version(void *arg)
const char *h_version = crypto_openssl_get_header_version_str();
tt_assert(version);
tt_assert(h_version);
tt_assert(!strcmpstart(version, h_version)); /* "-fips" suffix, etc */
tt_assert(!strstr(version, "OpenSSL"));
if (strcmpstart(version, h_version)) { /* "-fips" suffix, etc */
TT_DIE(("OpenSSL library version %s did not begin with header version %s.",
version, h_version));
}
if (strstr(version, "OpenSSL")) {
TT_DIE(("assertion failed: !strstr(\"%s\", \"OpenSSL\")", version));
}
int a=-1,b=-1,c=-1;
if (!strcmpstart(version, "LibreSSL") || !strcmpstart(version, "BoringSSL"))
return;