TLS error messages have changed slightly, adapt regex for expected
authorbluhm <bluhm@openbsd.org>
Wed, 30 Jun 2021 10:11:36 +0000 (10:11 +0000)
committerbluhm <bluhm@openbsd.org>
Wed, 30 Jun 2021 10:11:36 +0000 (10:11 +0000)
logs in syslogd regress.

regress/usr.sbin/syslogd/args-client-tls-tcp.pl
regress/usr.sbin/syslogd/args-server-tls-tcp.pl
regress/usr.sbin/syslogd/args-tls-cafile-default.pl

index b2ee423..806041f 100644 (file)
@@ -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 },
index 579efb8..02795b7 100644 (file)
@@ -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,
        },
     },
 );
index a779771..797b8c3 100644 (file)
@@ -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,
        },
     },