From: bluhm Date: Wed, 30 Jun 2021 10:11:36 +0000 (+0000) Subject: TLS error messages have changed slightly, adapt regex for expected X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dd3c189232d905c059be1465ceb4231928cf2db2;p=openbsd TLS error messages have changed slightly, adapt regex for expected logs in syslogd regress. --- diff --git a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl index b2ee423262c..806041f3de7 100644 --- a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl @@ -42,7 +42,7 @@ our %args = ( loggrep => { qr/syslogd\[\d+\]: tls logger .* connection error: /. qr/handshake failed: error:.*:SSL routines:/. - qr/ST_ACCEPT:tlsv1 alert protocol version/ => 1, + qr/ACCEPT_SR_CLNT_HELLO:tlsv1 alert protocol version/ => 1, }, }, pipe => { nocheck => 1 }, diff --git a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl index 579efb87d43..02795b763b7 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl @@ -41,7 +41,7 @@ our %args = ( loggrep => { qr/syslogd\[\d+\]: loghost .* connection error: /. qr/handshake failed: error:.*:SSL routines:/. - qr/ST_CONNECT:tlsv1 alert protocol version/ => 1, + qr/CONNECT_CR_SRVR_HELLO:tlsv1 alert protocol version/ => 1, }, }, ); diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl index a77977117fe..797b8c3683f 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl @@ -38,7 +38,7 @@ our %args = ( qr/listen sock: (127.0.0.1|::1) \d+/ => 1, qr/IO::Socket::SSL socket accept failed: /. qr/.*,SSL accept attempt failed error:.*/. - qr/(ST_ACCEPT:tlsv1 alert unknown ca|$errors)/ => 1, + qr/(ACCEPT_SR_FINISHED:tlsv1 alert unknown ca|$errors)/ => 1, get_testgrep() => 0, }, },