diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-01-30 15:13:11 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-01-30 15:13:11 +0000 |
| commit | d593d487eb76ac0840cf4ffc325b2cfda720d873 (patch) | |
| tree | 0ea457732205cb6c24f92ae9f2acb8403126e69d | |
| parent | bb3cad44385e22b29e98da59190363a8df5e6725 (diff) | |
TLS connect error message has changed, adapt tests.
4 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl index f7a979d96ff..386e35f1f43 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl @@ -39,7 +39,7 @@ our %args = ( }, file => { loggrep => { - qr/syslogd: loghost .* connection error: SSL connect failed: 1/ + qr/syslogd: loghost .* connection error: TLS connect failed \(1\)/ => 1, }, }, diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl index 1f2c851e74d..390df3b499a 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl @@ -15,7 +15,7 @@ our %args = ( loggrep => { qr/CAfile \/etc\/ssl\/cert.pem/ => 1, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', - qr/connection error: SSL connect failed: 1/ => 2, + qr/connection error: TLS connect failed \(1\)/ => 2, get_testlog() => 1, }, cacrt => "default", diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl b/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl index 33017d29a07..fc2630cd322 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-fake.pl @@ -15,7 +15,7 @@ our %args = ( loggrep => { qr/CAfile fake-ca.crt/ => 1, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', - qr/connection error: SSL connect failed: 1/ => 2, + qr/connection error: TLS connect failed \(1\)/ => 2, get_testlog() => 1, }, cacrt => "fake-ca.crt", diff --git a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl index c70dd759f24..6ee63e20826 100644 --- a/regress/usr.sbin/syslogd/args-tls-cipher-null.pl +++ b/regress/usr.sbin/syslogd/args-tls-cipher-null.pl @@ -14,7 +14,7 @@ our %args = ( loghost => '@tls://localhost:$connectport', loggrep => { qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', - qr/connection error: SSL connect failed: 1/ => 2, + qr/connection error: TLS connect failed \(1\)/ => 2, get_testlog() => 1, }, cacrt => "ca.crt", |