From: beck <beck@openbsd.org>
Date: Mon, 3 Jul 2023 05:31:56 +0000 (+0000)
Subject: Stop testing tls 1.0 and 1.1
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dbacfe20a2d2fade50db4ecc5e78ffb3cd073351;p=openbsd

Stop testing tls 1.0 and 1.1

They have gone behind the barn.
---

diff --git a/regress/usr.bin/openssl/appstest.sh b/regress/usr.bin/openssl/appstest.sh
index 859005ab1d3..37842ecf0cd 100755
--- a/regress/usr.bin/openssl/appstest.sh
+++ b/regress/usr.bin/openssl/appstest.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: appstest.sh,v 1.56 2023/04/26 09:07:59 tb Exp $
+# $OpenBSD: appstest.sh,v 1.57 2023/07/03 05:31:56 beck Exp $
 #
 # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org>
 #
@@ -1760,10 +1760,6 @@ function test_server_client {
 	sleep 1
 
 	# test by protocol version
-	if [ "$other_openssl_version" = "OpenSSL 1." ] ; then
-	test_sc_by_protocol_version $sc tls1   'Protocol  : TLSv1$'    $c_id
-	test_sc_by_protocol_version $sc tls1_1 'Protocol  : TLSv1\.1$' $c_id
-	fi
 	test_sc_by_protocol_version $sc tls1_2 'Protocol  : TLSv1\.2$' $c_id
 	test_sc_by_protocol_version $sc tls1_3 'Protocol  : TLSv1\.3$' $c_id
 
diff --git a/regress/usr.bin/openssl/test_client.sh b/regress/usr.bin/openssl/test_client.sh
index fed2baace07..00e5a853800 100644
--- a/regress/usr.bin/openssl/test_client.sh
+++ b/regress/usr.bin/openssl/test_client.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: test_client.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
+#	$OpenBSD: test_client.sh,v 1.3 2023/07/03 05:31:56 beck Exp $
 
 echo
 echo This starts a tls1 mode client to talk to the server run by 
@@ -9,4 +9,4 @@ echo type in this window after ssl negotiation and your output should
 echo be echoed by the server. 
 echo
 echo
-${OPENSSL:-/usr/bin/openssl} s_client -tls1
+${OPENSSL:-/usr/bin/openssl} s_client
diff --git a/regress/usr.bin/openssl/test_server.sh b/regress/usr.bin/openssl/test_server.sh
index ec4a78a27a8..8da660260a9 100644
--- a/regress/usr.bin/openssl/test_server.sh
+++ b/regress/usr.bin/openssl/test_server.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: test_server.sh,v 1.2 2018/02/06 02:31:13 tb Exp $
+#	$OpenBSD: test_server.sh,v 1.3 2023/07/03 05:31:56 beck Exp $
 
 echo This starts a tls1 mode server using the DSA certificate in ./server.pem
 echo Run ./testclient.sh in another window and type at it, you should 
@@ -7,4 +7,4 @@ echo see the results of the ssl negotiation, and stuff you type in the client
 echo should echo in this window
 echo
 echo
-${OPENSSL:-/usr/bin/openssl} s_server -tls1 -key testdsa.key -cert testdsa.pem
+${OPENSSL:-/usr/bin/openssl} s_server -key testdsa.key -cert testdsa.pem