From 7e8793815bb43f97a022c6b71850206dbbd5d378 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 10 Oct 2020 18:18:01 +0100 Subject: [PATCH] Testsuite & OpenSSL debug: regularise debug output, and fix test munging --- src/src/tls-openssl.c | 4 ++-- test/runtest | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 050b36c40..700b01d92 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -704,12 +704,12 @@ if (Ustrcmp(exp_curve, "auto") == 0) #else # if defined SSL_CTRL_SET_ECDH_AUTO DEBUG(D_tls) debug_printf( - "ECDH OpenSSL 1.0.2+ temp key parameter settings: autoselection\n"); + "ECDH OpenSSL 1.0.2+: temp key parameter settings: autoselection\n"); SSL_CTX_set_ecdh_auto(sctx, 1); return TRUE; # else DEBUG(D_tls) debug_printf( - "ECDH OpenSSL 1.1.0+ temp key parameter settings: default selection\n"); + "ECDH OpenSSL 1.1.0+: temp key parameter settings: default selection\n"); return TRUE; # endif #endif diff --git a/test/runtest b/test/runtest index a6ae28447..cd4b7a219 100755 --- a/test/runtest +++ b/test/runtest @@ -1074,8 +1074,8 @@ RESET_AFTER_EXTRA_LINE_READ: # only OpenSSL speaks of these next if /^TLS: preloading (DH params|ECDH curve|CA bundle) for server/; next if /^Diffie-Hellman initialized from default/; - next if /^ECDH OpenSSL [< ]?[\d.+]+ temp key parameter settings:/; - next if /^ECDH: .'*prime256v1'/; + next if /^ECDH OpenSSL (< )?[\d.+]+: temp key parameter settings:/; + next if /^ECDH: .*'prime256v1'/; next if /^tls_verify_certificates: system$/; next if /^tls_set_watch: .*\/cert.pem/; -- 2.30.2