From 57eb2f64630884ec5b65c22ff0349aec1d3032ce Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 25 Apr 2019 17:36:06 +0100 Subject: [PATCH] Testsuite: GnuTLS version variances --- test/confs/2019 | 9 +-------- test/runtest | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/test/confs/2019 b/test/confs/2019 index fdc030c23..bd2cf5a6a 100644 --- a/test/confs/2019 +++ b/test/confs/2019 @@ -29,14 +29,7 @@ begin acl check_recipient: accept hosts = : deny hosts = HOSTIPV4 - !encrypted = AES256-SHA:\ - AES256-GCM-SHA384:\ - IDEA-CBC-MD5:\ - DES-CBC3-SHA:\ - DHE_RSA_AES_256_CBC_SHA1:\ - DHE_RSA_3DES_EDE_CBC_SHA:\ - RSA_AES_256_CBC_SHA1 :\ - ECDHE_RSA_AES_256_GCM_SHA384 + !encrypted = * accept diff --git a/test/runtest b/test/runtest index d7e4325e3..d15bc6726 100755 --- a/test/runtest +++ b/test/runtest @@ -641,7 +641,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/\b(ECDHE-(RSA|ECDSA)-AES256-SHA|DHE-RSA-AES256-SHA256)\b/ke-$2-AES256-SHAnnn/g; # GnuTLS library error message changes - s/No certificate was found/The peer did not send any certificate/g; + s/(No certificate was found|Certificate is required)/The peer did not send any certificate/g; #(dodgy test?) s/\(certificate verification failed\): invalid/\(gnutls_handshake\): The peer did not send any certificate./g; s/\(gnutls_priority_set\): No or insufficient priorities were set/\(gnutls_handshake\): Could not negotiate a supported cipher suite/g; s/\(gnutls_handshake\): \KNo supported cipher suites have been found.$/Could not negotiate a supported cipher suite./; @@ -1281,7 +1281,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/ARC: AMS signing: privkey PEM-block import: error:\K[0-9A-F]{8}:(PEM routines):get_name:(no start line)/0906D06C:$1:PEM_read_bio:$2/; # gnutls version variances - if (/TLS error on connection \(recv\): .* Decode error/) + if (/TLS error on connection \(recv\): .* (Decode error|peer did not send any certificate)/) { my $prev = $_; $_ = ; -- 2.30.2