From 12373afb257c7db03a2f46fd8498aa4e8287b68a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 3 Dec 2016 21:51:14 +0000 Subject: [PATCH] Testsuite: OpenSSL error lines change going to 1.1 --- test/runtest | 11 +++++------ test/stdout/2102 | 2 +- test/stdout/2114 | 6 +++--- test/stdout/2124 | 2 +- test/stdout/2132 | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/test/runtest b/test/runtest index 508759ebf..eb19decfe 100755 --- a/test/runtest +++ b/test/runtest @@ -420,12 +420,6 @@ RESET_AFTER_EXTRA_LINE_READ: s?prvs=([^/]+)/[\da-f]{10}@?prvs=$1/xxxxxxxxxx@?g; # Old form s?prvs=[\da-f]{10}=([^@]+)@?prvs=xxxxxxxxxx=$1@?g; # New form - # Error lines on stdout from SSL contain process id values and file names. - # They also contain a source file name and line number, which may vary from - # release to release. - s/^\d+:error:/pppp:error:/; - s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/; - # There are differences in error messages between OpenSSL versions s/SSL_CTX_set_cipher_list/SSL_connect/; @@ -890,9 +884,14 @@ RESET_AFTER_EXTRA_LINE_READ: } # openssl version variances + # Error lines on stdout from SSL contain process id values and file names. + # They also contain a source file name and line number, which may vary from + # release to release. + next if /^SSL info:/; next if /SSL verify error: depth=0 error=certificate not trusted/; s/SSL3_READ_BYTES/ssl3_read_bytes/i; + s/^\d+:error:\d+(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/; # gnutls version variances next if /^Error in the pull function./; diff --git a/test/stdout/2102 b/test/stdout/2102 index b853763b6..0d96d1279 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -96,7 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2114 b/test/stdout/2114 index 7bc5fce86..7020b0c57 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -18,7 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -146,7 +146,7 @@ Key file = aux-fixed/cert1 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -207,7 +207,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:[...]:SSL alert number 44 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected diff --git a/test/stdout/2124 b/test/stdout/2124 index f4dd2078a..166f39657 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -20,7 +20,7 @@ Key file = aux-fixed/cert2 ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2132 b/test/stdout/2132 index 4665a8bea..322237463 100644 --- a/test/stdout/2132 +++ b/test/stdout/2132 @@ -96,7 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 TLS go ahead Attempting to start TLS -pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -- 2.25.1