summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2023-07-03 05:31:56 +0000
committerbeck <>2023-07-03 05:31:56 +0000
commit17ae1ac5b15361689bec3332903ac80898b214c5 (patch)
treebb6d80a4639ceb1dc61cd887eefccab5d07d8f54
parentdb3e457de095f59c07b260ad5f4a9f9afc47e82d (diff)
downloadopenbsd-17ae1ac5b15361689bec3332903ac80898b214c5.tar.gz
openbsd-17ae1ac5b15361689bec3332903ac80898b214c5.tar.bz2
openbsd-17ae1ac5b15361689bec3332903ac80898b214c5.zip
Stop testing tls 1.0 and 1.1
They have gone behind the barn.
-rwxr-xr-xsrc/regress/usr.bin/openssl/appstest.sh6
-rw-r--r--src/regress/usr.bin/openssl/test_client.sh4
-rw-r--r--src/regress/usr.bin/openssl/test_server.sh4
3 files changed, 5 insertions, 9 deletions
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh
index 859005ab1d..37842ecf0c 100755
--- a/src/regress/usr.bin/openssl/appstest.sh
+++ b/src/regress/usr.bin/openssl/appstest.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $OpenBSD: appstest.sh,v 1.56 2023/04/26 09:07:59 tb Exp $ 3# $OpenBSD: appstest.sh,v 1.57 2023/07/03 05:31:56 beck Exp $
4# 4#
5# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> 5# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org>
6# 6#
@@ -1760,10 +1760,6 @@ function test_server_client {
1760 sleep 1 1760 sleep 1
1761 1761
1762 # test by protocol version 1762 # test by protocol version
1763 if [ "$other_openssl_version" = "OpenSSL 1." ] ; then
1764 test_sc_by_protocol_version $sc tls1 'Protocol : TLSv1$' $c_id
1765 test_sc_by_protocol_version $sc tls1_1 'Protocol : TLSv1\.1$' $c_id
1766 fi
1767 test_sc_by_protocol_version $sc tls1_2 'Protocol : TLSv1\.2$' $c_id 1763 test_sc_by_protocol_version $sc tls1_2 'Protocol : TLSv1\.2$' $c_id
1768 test_sc_by_protocol_version $sc tls1_3 'Protocol : TLSv1\.3$' $c_id 1764 test_sc_by_protocol_version $sc tls1_3 'Protocol : TLSv1\.3$' $c_id
1769 1765
diff --git a/src/regress/usr.bin/openssl/test_client.sh b/src/regress/usr.bin/openssl/test_client.sh
index fed2baace0..00e5a85380 100644
--- a/src/regress/usr.bin/openssl/test_client.sh
+++ b/src/regress/usr.bin/openssl/test_client.sh
@@ -1,5 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $OpenBSD: test_client.sh,v 1.2 2018/02/06 02:31:13 tb Exp $ 2# $OpenBSD: test_client.sh,v 1.3 2023/07/03 05:31:56 beck Exp $
3 3
4echo 4echo
5echo This starts a tls1 mode client to talk to the server run by 5echo 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
9echo be echoed by the server. 9echo be echoed by the server.
10echo 10echo
11echo 11echo
12${OPENSSL:-/usr/bin/openssl} s_client -tls1 12${OPENSSL:-/usr/bin/openssl} s_client
diff --git a/src/regress/usr.bin/openssl/test_server.sh b/src/regress/usr.bin/openssl/test_server.sh
index ec4a78a27a..8da660260a 100644
--- a/src/regress/usr.bin/openssl/test_server.sh
+++ b/src/regress/usr.bin/openssl/test_server.sh
@@ -1,5 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $OpenBSD: test_server.sh,v 1.2 2018/02/06 02:31:13 tb Exp $ 2# $OpenBSD: test_server.sh,v 1.3 2023/07/03 05:31:56 beck Exp $
3 3
4echo This starts a tls1 mode server using the DSA certificate in ./server.pem 4echo This starts a tls1 mode server using the DSA certificate in ./server.pem
5echo Run ./testclient.sh in another window and type at it, you should 5echo 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
7echo should echo in this window 7echo should echo in this window
8echo 8echo
9echo 9echo
10${OPENSSL:-/usr/bin/openssl} s_server -tls1 -key testdsa.key -cert testdsa.pem 10${OPENSSL:-/usr/bin/openssl} s_server -key testdsa.key -cert testdsa.pem