diff options
5 files changed, 13 insertions, 12 deletions
diff --git a/regress/usr.sbin/syslogd/args-client-tls-fake.pl b/regress/usr.sbin/syslogd/args-client-tls-fake.pl index 5ece99184d3..ad35a423a07 100644 --- a/regress/usr.sbin/syslogd/args-client-tls-fake.pl +++ b/regress/usr.sbin/syslogd/args-client-tls-fake.pl @@ -34,7 +34,8 @@ our %args = ( qr{Server CAfile fake-ca.crt} => 1, qr{tls logger .* accepted} => 1, qr/syslogd: tls logger .* connection error: /. - qr/handshake failed: error:.*:CRYPTO_internal:/ => 1, + qr/handshake failed: error:.*:rsa routines:/. + qr/CRYPTO_internal:/ => 1, }, }, server => { diff --git a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl index 3d740892aa7..2a23ede7fcf 100644 --- a/regress/usr.sbin/syslogd/args-client-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-client-tls-tcp.pl @@ -41,8 +41,8 @@ our %args = ( file => { loggrep => { qr/syslogd: tls logger .* connection error: /. - qr/handshake failed: error:.*:/. - qr/SSL_internal:unknown protocol/ => 1, + qr/handshake failed: error:.*:SSL routines:/. + qr/ACCEPT_SR_CLNT_HELLO:unknown protocol/ => 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 d2870a77c66..274091df30b 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-client-fake.pl @@ -17,8 +17,8 @@ our %args = ( qr/ClientCertfile client.crt/ => 1, qr/ClientKeyfile client.key/ => 1, qr/syslogd: loghost .* connection error: /. - qr/handshake failed: error:.*:/. - qr/SSL_internal:tlsv1 alert decrypt error/ => 2, + qr/handshake failed: error:.*:SSL routines:/. + qr/CONNECT_CR_FINISHED:tlsv1 alert decrypt error/ => 2, get_testgrep() => 1, }, }, @@ -30,8 +30,8 @@ our %args = ( exit => 255, loggrep => { qr/Server IO::Socket::SSL socket accept failed: /. - qr/,SSL accept attempt failed error:.*:/. - qr/SSL_internal:no certificate returned/ => 1. + qr/,SSL accept attempt failed error:.*:SSL routines:/. + qr/ACCEPT_SR_CERT:no certificate returned/ => 1. }, }, ); diff --git a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl index 011c406955c..e6a2ada6bb2 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl @@ -40,8 +40,8 @@ our %args = ( file => { loggrep => { qr/syslogd: loghost .* connection error: /. - qr/handshake failed: error:.*:/. - qr/SSL_internal:wrong version number/ => 1, + qr/handshake failed: error:.*:SSL routines:/. + qr/CONNECT_CR_SRVR_HELLO:wrong version number/ => 1, }, }, ); diff --git a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl index f4d530e99b3..67c59f75be0 100644 --- a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl +++ b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl @@ -15,8 +15,8 @@ our %args = ( loggrep => { qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', qr/syslogd: loghost .* connection error: /. - qr/handshake failed: error:.*:/. - qr/SSL_internal:sslv3 alert handshake failure/ => 2, + qr/handshake failed: error:.*:SSL routines:/. + qr/CONNECT_CR_SRVR_HELLO:sslv3 alert handshake failure/ => 2, get_testgrep() => 1, }, cacrt => "ca.crt", @@ -29,7 +29,7 @@ our %args = ( exit => 255, loggrep => { qr/listen sock: (127.0.0.1|::1) \d+/ => 1, - qr/SSL_internal:no shared cipher/ => 1, + qr/SSL routines:ACCEPT_SR_CLNT_HELLO_C:no shared cipher/ => 1, get_testgrep() => 0, }, }, |