From 097771672d0923b10d7eb44bc689e3f0ff717bce Mon Sep 17 00:00:00 2001
From: Xiaokang Qian <xiaokang.qian@arm.com>
Date: Wed, 9 Nov 2022 03:46:23 +0000
Subject: [PATCH] Update early data document and prerequisites check

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
---
 include/mbedtls/build_info.h     | 4 ++++
 include/mbedtls/check_config.h   | 5 +++--
 include/mbedtls/mbedtls_config.h | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/mbedtls/build_info.h b/include/mbedtls/build_info.h
index f1bb527700..71f5bffd24 100644
--- a/include/mbedtls/build_info.h
+++ b/include/mbedtls/build_info.h
@@ -119,6 +119,10 @@
 #undef MBEDTLS_SSL_EARLY_DATA
 #endif
 
+#if !defined(MBEDTLS_SSL_SESSION_TICKETS)
+#undef MBEDTLS_SSL_EARLY_DATA
+#endif
+
 #if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) || \
     defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED)
 #define MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index d36db4a9ec..4eb1528bb8 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -844,8 +844,9 @@
 
 /* Early data requires PSK related mode defined */
 #if defined(MBEDTLS_SSL_EARLY_DATA) && \
-        ( !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) && \
-          !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED))
+    ( !defined(MBEDTLS_SSL_SESSION_TICKETS) || \
+      ( !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED) && \
+        !defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED) ) )
 #error "MBEDTLS_SSL_EARLY_DATA  defined, but not all prerequisites"
 #endif
 
diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index b4c8635215..93ca9b58ae 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -1641,7 +1641,10 @@
 *           MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
 *
 * Comment this to disable support for early data. If MBEDTLS_SSL_PROTO_TLS1_3
-* is not enabled, this option does not have any effect on the build.
+* is not enabled or both MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED and
+* MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED are disabled or
+* MBEDTLS_SSL_SESSION_TICKETS is not enabled, this option does not have any
+* effect on the build.
 *
 * This feature is experimental, not completed and thus not ready for
 * production.