fix tls13_only_psk* fail

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
Mbed-TLS · Nov 6, 2022 · 8feb8a5 · 8feb8a5
1 parent e9b0c94
commit 8feb8a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
@@ -853,16 +853,10 @@
 #endif
 
 #if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_SRV_C) && \
-    !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED) && \
-    !defined(MBEDTLS_SSL_SESSION_TICKETS) && \
-    !defined(MBEDTLS_SSL_MAX_EARLY_DATA_SIZE)
-#error "MBEDTLS_SSL_EARLY_DATA defined, but not all prerequisites"
-#endif
-
-#if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_SRV_C) && \
-    ( ( MBEDTLS_SSL_MAX_EARLY_DATA_SIZE <= 0 ) || \
+    ( !defined(MBEDTLS_SSL_MAX_EARLY_DATA_SIZE)     || \
+      ( MBEDTLS_SSL_MAX_EARLY_DATA_SIZE <= 0 )      || \
       ( MBEDTLS_SSL_MAX_EARLY_DATA_SIZE > UINT32_MAX ) )
-#error "MBEDTLS_SSL_MAX_EARLY_DATA_SIZE MUST be in 1..UINT32_MAX"
+#error "MBEDTLS_SSL_MAX_EARLY_DATA_SIZE MUST be defined and in range(1..UINT32_MAX)"
 #endif
 
 #if defined(MBEDTLS_SSL_EARLY_DATA_EXT_PSK_ENABLED) && \

diff --git a/tests/opt-testcases/tls13-misc.sh b/tests/opt-testcases/tls13-misc.sh
@@ -21,8 +21,9 @@
 EARLY_DATA_INPUT=data_files/early_data.txt
 requires_gnutls_next
 requires_config_disabled MBEDTLS_SSL_EARLY_DATA
-requires_all_configs_enabled MBEDTLS_SSL_SESSION_TICKETS MBEDTLS_SSL_SRV_C \
-                             MBEDTLS_SSL_CLI_C MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME
+requires_all_configs_enabled MBEDTLS_SSL_SESSION_TICKETS MBEDTLS_SSL_SRV_C  \
+                             MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME              \
+                             MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
 run_test "TLS 1.3 G->m: EarlyData: feature unavailable, good." \
          "$P_SRV force_version=tls13 reco_debug_level=4" \
          "$G_NEXT_CLI localhost --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+GROUP-ALL -d 10 -r --earlydata $EARLY_DATA_INPUT" \
@@ -32,8 +33,9 @@ run_test "TLS 1.3 G->m: EarlyData: feature unavailable, good." \
          -s "Ignore application message"
 
 requires_gnutls_next
-requires_all_configs_enabled MBEDTLS_SSL_EARLY_DATA MBEDTLS_SSL_SESSION_TICKETS MBEDTLS_SSL_SRV_C \
-                             MBEDTLS_SSL_CLI_C MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME
+requires_all_configs_enabled MBEDTLS_SSL_EARLY_DATA MBEDTLS_SSL_SESSION_TICKETS     \
+                             MBEDTLS_SSL_SRV_C MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME    \
+                             MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
 run_test "TLS 1.3 G->m: EarlyData: feature is disabled, good." \
          "$P_SRV force_version=tls13 reco_debug_level=4" \
          "$G_NEXT_CLI localhost --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+GROUP-ALL -d 10 -r --earlydata $EARLY_DATA_INPUT" \
@@ -43,8 +45,9 @@ run_test "TLS 1.3 G->m: EarlyData: feature is disabled, good." \
          -s "Ignore application message"
 
 requires_gnutls_next
-requires_all_configs_enabled MBEDTLS_SSL_EARLY_DATA MBEDTLS_SSL_SESSION_TICKETS MBEDTLS_SSL_SRV_C \
-                             MBEDTLS_SSL_CLI_C MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME
+requires_all_configs_enabled MBEDTLS_SSL_EARLY_DATA MBEDTLS_SSL_SESSION_TICKETS \
+                             MBEDTLS_SSL_SRV_C MBEDTLS_DEBUG_C MBEDTLS_HAVE_TIME \
+                             MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
 run_test "TLS 1.3 G->m: EarlyData: enabled and max_size=1024, good." \
          "$P_SRV force_version=tls13 reco_debug_level=5 early_data=1024" \
          "$G_NEXT_CLI localhost --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+GROUP-ALL -d 10 -r --earlydata $EARLY_DATA_INPUT" \