Testsuite & OpenSSL debug: regularise debug output, and fix test munging

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 050b36c40ff33749e8e58db009d212dfabcda8e8..700b01d923b9b754d40bce600f7e618a0b41affe 100644 (file)
--- 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 a6ae2844764f3d9907bb27b2ca2ac0261926cd76..cd4b7a2193e8d2916a411eda2831b1d04a45b5fc 100755 (executable)
--- 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/;