Move ticket, alpn detection into maybe_requires_ciphersuite_enabled

No intended behavior change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-04-08 19:29:27 +02:00
parent 511fdf435f
commit 3c985f6b70

View File

@ -288,6 +288,15 @@ detect_required_features() {
esac;;
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
}
@ -1173,16 +1182,6 @@ run_test() {
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" "$@"