From 490f565b99190a376b6706772a381bebe1350a3c Mon Sep 17 00:00:00 2001 From: beck Date: Mon, 3 Jul 2023 05:45:53 +0000 Subject: [PATCH] Stop caring about tls 1.0 and 1.1. Syslogd is not a tls protocol tester in any case. These tests should not care what version of tls they use --- .../usr.sbin/syslogd/args-tls-v10-noverify.pl | 32 ------------------ .../usr.sbin/syslogd/args-tls-v10-verify.pl | 33 ------------------- 2 files changed, 65 deletions(-) delete mode 100644 regress/usr.sbin/syslogd/args-tls-v10-noverify.pl delete mode 100644 regress/usr.sbin/syslogd/args-tls-v10-verify.pl diff --git a/regress/usr.sbin/syslogd/args-tls-v10-noverify.pl b/regress/usr.sbin/syslogd/args-tls-v10-noverify.pl deleted file mode 100644 index 383593606f8..00000000000 --- a/regress/usr.sbin/syslogd/args-tls-v10-noverify.pl +++ /dev/null @@ -1,32 +0,0 @@ -# The client writes a message to Sys::Syslog native method. -# The syslogd writes it into a file and through a pipe. -# The syslogd passes it via TLS to localhost loghost without verification. -# The server receives the message on its TLS version 1.0 socket. -# Find the message in client, file, pipe, syslogd, server log. -# Check that server log contains ssl version 1. - -use strict; -use warnings; -use Socket; - -our %args = ( - syslogd => { - loghost => '@tls://localhost:$connectport', - loggrep => { - qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', - get_testgrep() => 1, - qr/syslogd: loghost .* connection error: connect failed:/ => 0, - }, - }, - server => { - listen => { domain => AF_UNSPEC, proto => "tls", addr => "localhost" }, - loggrep => { - qr/listen sock: (127.0.0.1|::1) \d+/ => 1, - get_testgrep() => 1, - qr/ssl version: TLSv1$/ => 1, - }, - sslversion => "TLSv1", - }, -); - -1; diff --git a/regress/usr.sbin/syslogd/args-tls-v10-verify.pl b/regress/usr.sbin/syslogd/args-tls-v10-verify.pl deleted file mode 100644 index c3feaba3893..00000000000 --- a/regress/usr.sbin/syslogd/args-tls-v10-verify.pl +++ /dev/null @@ -1,33 +0,0 @@ -# The client writes a message to Sys::Syslog native method. -# The syslogd writes it into a file and through a pipe. -# The syslogd passes it via TLS to localhost loghost. -# The server receives the message on its TLS version 1.0 socket. -# Find the message in client, file, pipe, syslogd, server log. -# Check that server log contains ssl version 1. - -use strict; -use warnings; -use Socket; - -our %args = ( - syslogd => { - loghost => '@tls://localhost:$connectport', - loggrep => { - qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4', - get_testgrep() => 1, - qr/syslogd: loghost .* connection error: connect failed:/ => 0, - }, - cacrt => "ca.crt", - }, - server => { - listen => { domain => AF_UNSPEC, proto => "tls", addr => "localhost" }, - loggrep => { - qr/listen sock: (127.0.0.1|::1) \d+/ => 1, - get_testgrep() => 1, - qr/ssl version: TLSv1$/ => 1, - }, - sslversion => "TLSv1", - }, -); - -1; -- 2.20.1