diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2021-04-19 10:58:32 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2021-04-19 10:58:32 +0000 |
| commit | c3c34e2b4c55760e9c52e4c229192b9e9368704f (patch) | |
| tree | fc6a8d249c4f6c72694ecf1080630377e30207d3 /regress | |
| parent | 2b40a6bcd46d55362efcfd4d2267e3d67067306a (diff) | |
Fix TLS error message race. Due to less handshakes in TLS 1.3 an
EPIPE error may be reported instead of a TLS alert.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/syslogd/args-tls-cafile-default.pl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl index 440733185ab..a77977117fe 100644 --- a/regress/usr.sbin/syslogd/args-tls-cafile-default.pl +++ b/regress/usr.sbin/syslogd/args-tls-cafile-default.pl @@ -7,8 +7,12 @@ use strict; use warnings; +use Errno ':POSIX'; use Socket; +my @errors = (EPIPE); +my $errors = "(". join("|", map { $! = $_ } @errors). ")"; + our %args = ( syslogd => { loghost => '@tls://localhost:$connectport', @@ -32,8 +36,9 @@ our %args = ( exit => 255, loggrep => { qr/listen sock: (127.0.0.1|::1) \d+/ => 1, - qr/SSL accept attempt failed error:/. - qr/.*ST_ACCEPT:tlsv1 alert unknown ca/ => 1, + qr/IO::Socket::SSL socket accept failed: /. + qr/.*,SSL accept attempt failed error:.*/. + qr/(ST_ACCEPT:tlsv1 alert unknown ca|$errors)/ => 1, get_testgrep() => 0, }, }, |