diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-31 16:35:58 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-31 16:35:58 +0000 |
| commit | 0033b8fe37817627788939a6a7b8253e1cf04551 (patch) | |
| tree | 611c541aa8fa645e318239887f1b72ce654d190f /regress | |
| parent | 2bba7dc5c89d676d237d552502ff325af9a07e25 (diff) | |
The libssl and libcrypto error messages have changed. Adapt the
regex for the expected output in the log files.
Diffstat (limited to 'regress')
5 files changed, 12 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 3a71b5368fb..5ece99184d3 100644 --- a/regress/usr.sbin/syslogd/args-client-tls-fake.pl +++ b/regress/usr.sbin/syslogd/args-client-tls-fake.pl @@ -34,7 +34,7 @@ our %args = ( qr{Server CAfile fake-ca.crt} => 1, qr{tls logger .* accepted} => 1, qr/syslogd: tls logger .* connection error: /. - qr/handshake failed: error:.*RSA_/ => 1, + qr/handshake failed: error:.*: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 a8070473dad..3d740892aa7 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 routines:SSL23_GET_CLIENT_HELLO:unknown protocol/ => 1, + qr/handshake failed: error:.*:/. + qr/SSL_internal: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 43185d608cf..d2870a77c66 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/SSL3_READ_BYTES:tlsv1 alert decrypt error/ => 2, + qr/handshake failed: error:.*:/. + qr/SSL_internal: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/SSL3_GET_CLIENT_CERTIFICATE:no certificate returned/ => 1. + qr/,SSL accept attempt failed error:.*:/. + qr/SSL_internal: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 9557d4a6637..011c406955c 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/SSL23_GET_SERVER_HELLO:unknown protocol/ => 1, + qr/handshake failed: error:.*:/. + qr/SSL_internal: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 3a3d92e5a57..f4d530e99b3 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/SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure/ => 2, + qr/handshake failed: error:.*:/. + qr/SSL_internal: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/no shared cipher/ => 1, + qr/SSL_internal:no shared cipher/ => 1, get_testgrep() => 0, }, }, |