diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:28:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-17 19:28:59 -0400 |
| commit | 987174cc6fb4915299236fd76e3bb6c893e78653 (patch) | |
| tree | 993938709029c7b77f2fa1182b44d3d3f8e73a66 | |
| parent | 4e439cd4010c7a6e511470a84ebf1ca830305fb3 (diff) | |
| parent | 8483241b4e2538e9adb75c7ffed2787afd361df6 (diff) | |
| download | tor-987174cc6fb4915299236fd76e3bb6c893e78653.tar.gz tor-987174cc6fb4915299236fd76e3bb6c893e78653.zip | |
Merge remote-tracking branch 'github/bug26152_035'
| -rw-r--r-- | changes/bug26152 | 4 | ||||
| -rw-r--r-- | src/test/test_crypto.c | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/changes/bug26152 b/changes/bug26152 new file mode 100644 index 0000000000..34fda09b25 --- /dev/null +++ b/changes/bug26152 @@ -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. diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index bb2e340dd2..a6913ded94 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -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; |