commit c48d25ac8d5cb8320a56a61cbee7754420d77309 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 28 10:47:39 2020 -0400
Fix a previously overstrict log message check.
OpenSSL doesn't seem to report error locations in the same way as before, which broke one of our tests.
Fixes bug 40170; bugfix on 0.2.8.1-alpha. --- changes/ticket40170 | 3 +++ src/test/test_tortls_openssl.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40170 b/changes/ticket40170 new file mode 100644 index 0000000000..cc1c8dbad1 --- /dev/null +++ b/changes/ticket40170 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Fix the "tortls/openssl/log_one_error" test to work with OpenSSL 3.0.0. + Fixes bug 40170; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_tortls_openssl.c b/src/test/test_tortls_openssl.c index f039980a25..f4e3430dac 100644 --- a/src/test/test_tortls_openssl.c +++ b/src/test/test_tortls_openssl.c @@ -283,8 +283,7 @@ test_tortls_log_one_error(void *ignored)
mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, 3), LOG_WARN, 0, NULL); - expect_log_msg("TLS error with 127.hello: " - "BN lib (in unknown library:(null):---)\n"); + expect_log_msg_containing("TLS error with 127.hello");
mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_HTTP_REQUEST),