commit 148c3deba115da27f950ee9d2046aee441d50f49
author Janos Follath <janos.follath@arm.com> Tue Feb 04 11:18:04 2020 +0000
committer GitHub <noreply@github.com> Tue Feb 04 11:18:04 2020 +0000
tree ec6a4837d5980d2730cd12d7b5f4ef4b25688928
parent 2fdb1af18ca0877eb4572d68fedf16a03803c10a
parent bc4da29d060916f94f1c08f6dbd2e74e09f24b15

Merge pull request #3018 from mpg/fix-ssl-opt-gnutls-no-sha1

Fix ssl-opt.sh for GnuTLS versions rejecting SHA-1

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 3d0ca87..e65b8ec 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -5500,15 +5500,8 @@
 # Test for ClientHello without extensions
 
 requires_gnutls
-run_test    "ClientHello without extensions, SHA-1 allowed" \
-            "$P_SRV debug_level=3 key_file=data_files/server2.key crt_file=data_files/server2.crt" \
-            "$G_CLI --priority=NORMAL:%NO_EXTENSIONS:%DISABLE_SAFE_RENEGOTIATION localhost" \
-            0 \
-            -s "dumping 'client hello extensions' (0 bytes)"
-
-requires_gnutls
-run_test    "ClientHello without extensions, SHA-1 forbidden in certificates on server" \
-            "$P_SRV debug_level=3 key_file=data_files/server2.key crt_file=data_files/server2.crt allow_sha1=0" \
+run_test    "ClientHello without extensions" \
+            "$P_SRV debug_level=3" \
             "$G_CLI --priority=NORMAL:%NO_EXTENSIONS:%DISABLE_SAFE_RENEGOTIATION localhost" \
             0 \
             -s "dumping 'client hello extensions' (0 bytes)"