syslogd(8) uses new libtls certificate and key file loading. So

the tests behave a little bit different now.

diff --git a/regress/usr.sbin/syslogd/args-client-tls4.pl b/regress/usr.sbin/syslogd/args-client-tls4.pl
index 84b104e..3ff39dd 100644 (file)
--- 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 aa51ca0..4296f62 100644 (file)
--- 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 d476b68..2f0e758 100644 (file)
--- 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 47599da..25374a7 100644 (file)
--- 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 51bde1a..6d5e364 100644 (file)
--- 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,