summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/regress/usr.bin/openssl/appstest.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/regress/usr.bin/openssl/appstest.sh b/src/regress/usr.bin/openssl/appstest.sh
index 1cc8bacfb1..c4a0bf50cc 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.47 2021/02/26 15:15:40 tb Exp $ 3# $OpenBSD: appstest.sh,v 1.48 2021/04/24 00:10:43 inoguchi Exp $
4# 4#
5# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> 5# Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org>
6# 6#
@@ -1721,18 +1721,11 @@ function test_server_client {
1721 pwd=$sv_rsa_pass 1721 pwd=$sv_rsa_pass
1722 fi 1722 fi
1723 1723
1724 $s_bin version | grep 'OpenSSL 1.1.1' > /dev/null
1725 if [ $? -eq 0 ] ; then
1726 extra_opts="-4"
1727 else
1728 extra_opts=""
1729 fi
1730
1731 start_message "s_server ... start TLS/SSL test server" 1724 start_message "s_server ... start TLS/SSL test server"
1732 $s_bin s_server -accept $port -CAfile $ca_cert \ 1725 $s_bin s_server -accept $port -CAfile $ca_cert \
1733 -cert $crt -key $key -pass pass:$pwd \ 1726 -cert $crt -key $key -pass pass:$pwd \
1734 -context "appstest.sh" -id_prefix "APPSTEST.SH" -crl_check \ 1727 -context "appstest.sh" -id_prefix "APPSTEST.SH" -crl_check \
1735 -alpn "http/1.1,spdy/3" -www -cipher ALL $extra_opts \ 1728 -alpn "http/1.1,spdy/3" -www -cipher ALL -4 \
1736 -msg -tlsextdebug -verify 3 -groups X25519:P-384:P-256 \ 1729 -msg -tlsextdebug -verify 3 -groups X25519:P-384:P-256 \
1737 -status -servername xyz -cert2 $crt -key2 $key \ 1730 -status -servername xyz -cert2 $crt -key2 $key \
1738 > $s_server_out 2>&1 & 1731 > $s_server_out 2>&1 &