From ea215fc4e672c341d97565e0b83413393cee32b2 Mon Sep 17 00:00:00 2001 From: bluhm Date: Wed, 17 Aug 2016 12:22:27 +0000 Subject: [PATCH] syslogd(8) uses new libtls certificate and key file loading. So the tests behave a little bit different now. --- regress/usr.sbin/syslogd/args-client-tls4.pl | 2 +- regress/usr.sbin/syslogd/args-client-tls6.pl | 2 +- regress/usr.sbin/syslogd/args-tls-cafile-empty.pl | 2 +- regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl | 2 +- regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/regress/usr.sbin/syslogd/args-client-tls4.pl b/regress/usr.sbin/syslogd/args-client-tls4.pl index 84b104e9278..3ff39dd0e6c 100644 --- a/regress/usr.sbin/syslogd/args-client-tls4.pl +++ b/regress/usr.sbin/syslogd/args-client-tls4.pl @@ -29,7 +29,7 @@ our %args = ( ktrace => { qr{NAMI "/etc/ssl/private/127.0.0.1:6514.key"} => 1, qr{NAMI "/etc/ssl/private/127.0.0.1.key"} => 1, - qr{NAMI "/etc/ssl/127.0.0.1:6514.crt"} => 1, + qr{NAMI "/etc/ssl/127.0.0.1:6514.crt"} => 0, qr{NAMI "/etc/ssl/127.0.0.1.crt"} => 1, }, loggrep => { diff --git a/regress/usr.sbin/syslogd/args-client-tls6.pl b/regress/usr.sbin/syslogd/args-client-tls6.pl index aa51ca031e6..4296f62ce78 100644 --- a/regress/usr.sbin/syslogd/args-client-tls6.pl +++ b/regress/usr.sbin/syslogd/args-client-tls6.pl @@ -29,7 +29,7 @@ our %args = ( ktrace => { qr{NAMI "/etc/ssl/private/\[::1\]:6514.key"} => 1, qr{NAMI "/etc/ssl/private/::1.key"} => 1, - qr{NAMI "/etc/ssl/\[::1\]:6514.crt"} => 1, + qr{NAMI "/etc/ssl/\[::1\]:6514.crt"} => 0, qr{NAMI "/etc/ssl/::1.crt"} => 1, }, loggrep => { diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl b/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl index d476b68440f..2f0e7585648 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-empty.pl @@ -13,7 +13,7 @@ our %args = ( syslogd => { loghost => '@tls://localhost:$connectport', loggrep => { - qr/CAfile empty, size 0/ => 1, + qr/CAfile empty/ => 1, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', qr/syslogd: tls_connect_socket .*: /. qr/ssl verify memory setup failure/ => 2, diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl index 47599da7045..25374a7a492 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-noexist.pl @@ -13,7 +13,7 @@ our %args = ( syslogd => { loghost => '@tls://localhost:$connectport', loggrep => { - qr/open CAfile: No such file or directory/ => 2, + qr/syslogd: load client TLS CA failed/ => 2, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', qr/syslogd: tls_connect_socket .*: /. qr/ssl verify memory setup failure/ => 2, diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl index 51bde1a3471..6d5e36403dc 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl @@ -13,7 +13,7 @@ our %args = ( syslogd => { loghost => '@tls://localhost:$connectport', loggrep => { - qr/CAfile larger than 50MB/ => 2, + qr/CAfile toobig/ => 1, qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', qr/syslogd: tls_connect_socket .*: /. qr/ssl verify memory setup failure/ => 2, -- 2.20.1