Error messages for LibreSSL have changed when switching to TLS 1.3.

3 files changed, 21 insertions, 20 deletions

diff --git a/regress/usr.sbin/syslogd/args-client-tls-error.pl b/regress/usr.sbin/syslogd/args-client-tls-error.pl
index 10024e5da99..7925ae6ee5d 100644
--- a/regress/usr.sbin/syslogd/args-client-tls-error.pl
+++ b/regress/usr.sbin/syslogd/args-client-tls-error.pl
@@ -43,7 +43,7 @@ our %args = (
     file => {
 	loggrep => {
 	    qr/syslogd\[\d+\]: tls logger .* connection error: /.
-		qr/read failed: $errors/ => 1,
+		qr/read failed: .*$errors/ => 1,
 	},
     },
     pipe => { nocheck => 1, },
diff --git a/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl b/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
index c58b906636a..048f211a451 100644
--- a/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl
@@ -7,8 +7,12 @@
 
 use strict;
 use warnings;
+use Errno ':POSIX';
 use Socket;
 
+my @errors = (EPIPE);
+my $errors = "(". join("|", map { $! = $_ } @errors). ")";
+
 our %args = (
     syslogd => {
 	options => [qw(-c client.crt -k client.key)],
@@ -16,9 +20,7 @@ our %args = (
 	loggrep => {
 	    qr/ClientCertfile client.crt/ => 1,
 	    qr/ClientKeyfile client.key/ => 1,
-	    qr/syslogd\[\d+\]: loghost .* connection error: /.
-		qr/handshake failed: error:.*:SSL routines:/.
-		qr/CONNECT_CR_FINISHED:tlsv1 alert decrypt error/ => 1,
+	    qr/syslogd\[\d+\]: loghost .* connection error: .*$errors/ => 1,
 	    get_testgrep() => 1,
 	},
     },
@@ -30,8 +32,7 @@ our %args = (
 	exit => 255,
 	loggrep => {
 	    qr/Server IO::Socket::SSL socket accept failed: /.
-		qr/,SSL accept attempt failed error:.*:SSL routines:/.
-		qr/ACCEPT_SR_CERT:no certificate returned/ => 1.
+		qr/.*certificate verify failed/ => 1.
 	},
     },
 );
diff --git a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
index e0641bb48a9..b53a9a34efd 100644
--- a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
+++ b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl
@@ -8,25 +8,27 @@
 
 use strict;
 use warnings;
-use Socket;
 use Errno ':POSIX';
+use Socket;
+
+my @errors = (EPIPE);
+my $errors = "(". join("|", map { $! = $_ } @errors). ")";
 
 our %args = (
     client => {
 	func => sub { write_between2logs(shift, sub {
 	    my $self = shift;
 	    ${$self->{syslogd}}->loggrep(
-		qr/SSL_internal:unknown failure occurred/, 5)
-		or die ref($self), " no SSL_internal error in syslogd.log";
+		qr/connection error: handshake failed:/, 5)
+		or die ref($self), " no handshake failed error in syslogd.log";
 	})},
     },
     syslogd => {
 	loghost => '@tls://127.0.0.1:$connectport',
 	loggrep => {
 	    qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=6',
-	    qr/syslogd\[\d+\]: /.
-		qr/(connect .*|.* connection error: handshake failed): /.
-		qr/.*SSL_internal:unknown failure occurred/ => 1,
+	    qr/syslogd\[\d+\]: .*/.
+		qr/connection error: handshake failed:/ => 1,
 	    get_between2loggrep(),
 	},
     },
@@ -38,24 +40,22 @@ our %args = (
 	    shutdown(\*STDOUT, 1)
 		or die ref($self), " shutdown write failed: $!";
 	    ${$self->{syslogd}}->loggrep(
-		qr/SSL_internal:unknown failure occurred/, 5)
-		or die ref($self), " no SSL_internal error in syslogd.log";
+		qr/connection error: handshake failed:/, 5)
+		or die ref($self), " no handshake failed error in syslogd.log";
 	    $self->listen();
 	})},
 	loggrep => {
 	    qr/Accepted/ => 2,
 	    qr/syslogd\[\d+\]: loghost .* connection close/ => 1,
-	    qr/syslogd\[\d+\]: /.
-		qr/(connect .*|.* connection error: handshake failed): /.
-		qr/.*SSL_internal:unknown failure occurred/ => 1,
+	    qr/syslogd\[\d+\]: .*/.
+		qr/connection error: handshake failed:/ => 1,
 	    get_between2loggrep(),
 	},
     },
     file => {
 	loggrep => {
-	    qr/syslogd\[\d+\]: /.
-		qr/(connect .*|.* connection error: handshake failed): /.
-		qr/.*SSL_internal:unknown failure occurred/ => 1,
+	    qr/syslogd\[\d+\]: .*/.
+		qr/connection error: handshake failed: .*$errors/ => 1,
 	    get_between2loggrep(),
 	},
     },