From 2ecf4ff349d47d917c3f756a65e0ebaf9e82aad5 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 13 Apr 2022 19:08:38 +0200 Subject: [PATCH] Restore explicit version requirement on 1.3 HelloRetryRequest tests A concurrent branch changes the way the test cases run to no longer use force_version=tls13, so the automatic version requirement detection will no longer work after that branch is merged. Therefore, keep the manual requirement (at least until automatic detection gets smarter). Signed-off-by: Gilles Peskine --- tests/ssl-opt.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 0bb8ca251..c0fae350e 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -9963,6 +9963,7 @@ run_test "TLS 1.3: CertificateRequest check - gnutls" \ -c "got a certificate request" \ -c "<= parse certificate request" +requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE requires_config_enabled MBEDTLS_DEBUG_C requires_config_enabled MBEDTLS_SSL_CLI_C @@ -9976,6 +9977,7 @@ run_test "TLS 1.3: HelloRetryRequest check, ciphersuite TLS_AES_128_GCM_SHA25 -c "tls13 client state: MBEDTLS_SSL_CLIENT_HELLO" \ -c "HTTP/1.0 200 ok" +requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE requires_config_enabled MBEDTLS_DEBUG_C requires_config_enabled MBEDTLS_SSL_CLI_C @@ -9989,6 +9991,7 @@ run_test "TLS 1.3: HelloRetryRequest check, ciphersuite TLS_AES_256_GCM_SHA38 -c "tls13 client state: MBEDTLS_SSL_CLIENT_HELLO" \ -c "HTTP/1.0 200 ok" +requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_gnutls_tls1_3 requires_gnutls_next_no_ticket requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE @@ -10003,6 +10006,7 @@ run_test "TLS 1.3: HelloRetryRequest check, ciphersuite TLS_AES_128_GCM_SHA25 -c "tls13 client state: MBEDTLS_SSL_CLIENT_HELLO" \ -c "HTTP/1.0 200 OK" +requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3 requires_gnutls_tls1_3 requires_gnutls_next_no_ticket requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE