commit 600804b0e7b7755e77fe9d48dc1b74d678c37c66
author Xiaokang Qian <xiaokang.qian@arm.com> Thu Oct 20 09:22:38 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Tue Oct 25 03:00:18 2022 +0000
tree 691c2e29a08cb82f99e6030bf2fccb21d2918c9a
parent 54413b10c2350cbf6a637bdb0fc244b931a7bb08

Remove useless early data related macros for the time being

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

include/mbedtls/mbedtls_config.h

diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 8e45726..9480de0 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -1635,8 +1635,11 @@
 /**
 * \def MBEDTLS_SSL_EARLY_DATA
 *
-* Allows to add functionality for TLS/DTLS 1.3 early data.
+* Enable support for RFC 8446 TLS 1.3 early data.
 *
+* Requires: MBEDTLS_SSL_PROTO_TLS1_3
+*
+* Comment this to disable support for early data.
 */
 //#define MBEDTLS_SSL_EARLY_DATA
 

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 57c07b4..b8e12ec 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -332,9 +332,6 @@
 #define MBEDTLS_SSL_EARLY_DATA_DISABLED        0
 #define MBEDTLS_SSL_EARLY_DATA_ENABLED         1
 
-#define MBEDTLS_SSL_EARLY_DATA_OFF        0
-#define MBEDTLS_SSL_EARLY_DATA_ON         1
-
 #define MBEDTLS_SSL_DTLS_SRTP_MKI_UNSUPPORTED    0
 #define MBEDTLS_SSL_DTLS_SRTP_MKI_SUPPORTED      1
 
@@ -1921,8 +1918,8 @@
 * \brief          Set the early_data mode
 *                 Default: disabled on server and client
 *
-* \param ssl     SSL context
-* \param early_data can be:
+* \param conf     The SSL configuration to use.
+* \param early_data_enabled can be:
 *
 *  MBEDTLS_SSL_EARLY_DATA_DISABLED:  early data functionality will not be used
 *                        (default on server)
@@ -1934,9 +1931,6 @@
 *                        lack of replay protection of the early data application
 *                        payloads.
 *
-* \param max_early_data  Max number of bytes allowed for early data (server only).
-* \param early_data_callback Callback function when early data is received (server
-*                            only).
 */
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_EARLY_DATA)
 void mbedtls_ssl_conf_early_data( mbedtls_ssl_config *conf,

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index c02ff58..41bb9c5 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -243,9 +243,6 @@
 /* Maximum size in bytes of list in supported elliptic curve ext., RFC 4492 */
 #define MBEDTLS_SSL_MAX_CURVE_LIST_LEN         65535
 
-/* Maximum amount of early data to buffer on the server. */
-#define MBEDTLS_SSL_MAX_EARLY_DATA             1024
-
 #define MBEDTLS_RECEIVED_SIG_ALGS_SIZE         20
 
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 5f89593..976a134 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1084,7 +1084,7 @@
 void mbedtls_ssl_conf_early_data( mbedtls_ssl_config *conf,
                                   int early_data_enabled )
 {
-    conf->early_data_enabled = early_data;
+    conf->early_data_enabled = early_data_enabled;
 }
 #endif /* MBEDTLS_SSL_EARLY_DATA */