diff options
| author |   bluhm <bluhm@openbsd.org> | 2020-05-06 17:39:30 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2020-05-06 17:39:30 +0000 |
| commit | 99490db6b06d9d88dc6ab9ded797fc52db1b59a8 (patch) | |
| tree | 85387f8ff61cbdc69c4bc5b2addef3468c125ca9 | |
| parent | Only allow forkmda() to be called from a local action dispatcher. (diff) | |
| download | wireguard-openbsd-99490db6b06d9d88dc6ab9ded797fc52db1b59a8.tar.xz wireguard-openbsd-99490db6b06d9d88dc6ab9ded797fc52db1b59a8.zip | |
Currently LibreSSL reports an unknown SSL_internal error. Adjust
regex in test. So make regress passes for the release, the error
message will be improved later.
discussed with jsing@
| -rw-r--r-- | regress/usr.sbin/syslogd/args-server-tls-reconnect.pl | 19 | ||||
| -rw-r--r-- | regress/usr.sbin/syslogd/args-server-tls-tcp.pl | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl index 097501ac2fb..e0641bb48a9 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-reconnect.pl @@ -11,15 +11,13 @@ use warnings; use Socket; use Errno ':POSIX'; -my @errors = (ECONNREFUSED, EPIPE); -my $errors = "(". join("|", map { $! = $_ } @errors). ")"; - our %args = ( client => { func => sub { write_between2logs(shift, sub { my $self = shift; - ${$self->{syslogd}}->loggrep($errors, 5) - or die ref($self), " no $errors in syslogd.log"; + ${$self->{syslogd}}->loggrep( + qr/SSL_internal:unknown failure occurred/, 5) + or die ref($self), " no SSL_internal error in syslogd.log"; })}, }, syslogd => { @@ -28,7 +26,7 @@ our %args = ( qr/Logging to FORWTLS \@tls:\/\/127.0.0.1:\d+/ => '>=6', qr/syslogd\[\d+\]: /. qr/(connect .*|.* connection error: handshake failed): /. - $errors => 1, + qr/.*SSL_internal:unknown failure occurred/ => 1, get_between2loggrep(), }, }, @@ -39,8 +37,9 @@ our %args = ( $self->close(); shutdown(\*STDOUT, 1) or die ref($self), " shutdown write failed: $!"; - ${$self->{syslogd}}->loggrep($errors, 5) - or die ref($self), " no $errors in syslogd.log"; + ${$self->{syslogd}}->loggrep( + qr/SSL_internal:unknown failure occurred/, 5) + or die ref($self), " no SSL_internal error in syslogd.log"; $self->listen(); })}, loggrep => { @@ -48,7 +47,7 @@ our %args = ( qr/syslogd\[\d+\]: loghost .* connection close/ => 1, qr/syslogd\[\d+\]: /. qr/(connect .*|.* connection error: handshake failed): /. - $errors => 1, + qr/.*SSL_internal:unknown failure occurred/ => 1, get_between2loggrep(), }, }, @@ -56,7 +55,7 @@ our %args = ( loggrep => { qr/syslogd\[\d+\]: /. qr/(connect .*|.* connection error: handshake failed): /. - $errors => 1, + qr/.*SSL_internal:unknown failure occurred/ => 1, get_between2loggrep(), }, }, diff --git a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl index b7ff61f2b9b..6eed7bd078d 100644 --- a/regress/usr.sbin/syslogd/args-server-tls-tcp.pl +++ b/regress/usr.sbin/syslogd/args-server-tls-tcp.pl @@ -41,7 +41,7 @@ our %args = ( loggrep => { qr/syslogd\[\d+\]: loghost .* connection error: /. qr/handshake failed: error:.*:SSL routines:/. - qr/CONNECT_CR_SRVR_HELLO:wrong version number/ => 1, + qr/.*SSL_internal:unknown failure occurred/ => 1, }, }, ); |