commit 740b734f25bd559a1bc39caa73d3e37b1108408a
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Apr 08 19:29:27 2022 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 13 11:32:46 2022 +0200
tree 0fe72ae202e7a5d98958e5ab48e69077f1eedd0d
parent b898b3df90d3523d1c5c14cb4b5ef6fb84cbda3e

Move ticket, alpn detection into maybe_requires_ciphersuite_enabled

No intended behavior change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 3d086a9..2d6a6e7 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -286,6 +286,15 @@
             requires_ciphersuite_enabled "$tmp";;
     esac
 
+    case " $1 " in
+        *[-_\ =]tickets=[^0]*)
+            requires_config_enabled MBEDTLS_SSL_TICKET_C;;
+    esac
+    case " $1 " in
+        *[-_\ =]alpn=*)
+            requires_config_enabled MBEDTLS_SSL_ALPN;;
+    esac
+
     unset tmp
 }
 
@@ -1258,16 +1267,6 @@
         requires_config_enabled MBEDTLS_SSL_PROTO_DTLS
     fi
 
-    # Check more TLS protocol features.
-    case "$SRV_CMD $CLI_CMD" in
-        *[-_\ =]tickets=[^0]*)
-            requires_config_enabled MBEDTLS_SSL_TICKET_C;;
-    esac
-    case "$SRV_CMD $CLI_CMD" in
-        *[-_\ =]alpn=*)
-            requires_config_enabled MBEDTLS_SSL_ALPN;;
-    esac
-
     # If the client or server requires certain features that can be detected
     # from their command-line arguments, check that they're enabled.
     detect_required_features "$SRV_CMD" "$@"