summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-17 19:28:59 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-17 19:28:59 -0400
commit987174cc6fb4915299236fd76e3bb6c893e78653 (patch)
tree993938709029c7b77f2fa1182b44d3d3f8e73a66 /src
parent4e439cd4010c7a6e511470a84ebf1ca830305fb3 (diff)
parent8483241b4e2538e9adb75c7ffed2787afd361df6 (diff)
downloadtor-987174cc6fb4915299236fd76e3bb6c893e78653.tar.gz
tor-987174cc6fb4915299236fd76e3bb6c893e78653.zip
Merge remote-tracking branch 'github/bug26152_035'
Diffstat (limited to 'src')
-rw-r--r--src/test/test_crypto.c9
1 files changed, 7 insertions, 2 deletions
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;