commit 5233539d9f6c0eb7132d95cf58e0a853f30bb16b
author Jerry Yu <jerry.h.yu@arm.com> Thu Nov 23 18:06:06 2023 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Wed Dec 06 18:18:50 2023 +0800
tree 424d207446923d3c11f256b8e46ea6b0e37ac23b
parent 0069abc141fab9a262fa253c0cd2f34e9a167450

share write_early_data_ext function

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 133245b..addbbe1 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -2524,7 +2524,8 @@
 
 #if defined(MBEDTLS_SSL_EARLY_DATA)
     if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED) {
-        ret = mbedtls_ssl_tls13_write_early_data_ext(ssl, p, end, &output_len);
+        ret = mbedtls_ssl_tls13_write_early_data_ext(
+            ssl, p, end, &output_len, NULL);
         if (ret != 0) {
             return ret;
         }
@@ -3202,49 +3203,6 @@
     return 0;
 }
 
-#if defined(MBEDTLS_SSL_EARLY_DATA)
-/* RFC 8446 section 4.2.10
- *
- * struct {
- *     select (Handshake.msg_type) {
- *         case new_session_ticket:   uint32 max_early_data_size;
- *         ...
- *     };
- * } EarlyDataIndication;
- */
-MBEDTLS_CHECK_RETURN_CRITICAL
-static int ssl_tls13_write_nst_early_data_ext(mbedtls_ssl_context *ssl,
-                                              unsigned char *buf,
-                                              const unsigned char *end,
-                                              size_t *out_len)
-{
-    unsigned char *p = buf;
-    *out_len = 0;
-
-    if (!mbedtls_ssl_session_ticket_allow_early_data(ssl->session)) {
-        MBEDTLS_SSL_DEBUG_MSG(
-            4, ("early_data not allowed, skip early_data extension in "
-                "NewSessionTicket"));
-        return 0;
-    }
-
-    MBEDTLS_SSL_CHK_BUF_PTR(p, end, 8);
-
-    MBEDTLS_PUT_UINT16_BE(MBEDTLS_TLS_EXT_EARLY_DATA, p, 0);
-    MBEDTLS_PUT_UINT16_BE(4, p, 2);
-    MBEDTLS_PUT_UINT32_BE(ssl->conf->max_early_data_size, p, 4);
-    MBEDTLS_SSL_DEBUG_MSG(
-        4, ("Sent max_early_data_size=%u",
-            (unsigned int) ssl->conf->max_early_data_size));
-
-    *out_len = 8;
-
-    mbedtls_ssl_tls13_set_hs_sent_ext_mask(ssl, MBEDTLS_TLS_EXT_EARLY_DATA);
-
-    return 0;
-}
-#endif /* MBEDTLS_SSL_EARLY_DATA */
-
 /* This function creates a NewSessionTicket message in the following format:
  *
  * struct {
@@ -3371,7 +3329,7 @@
     if (ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED &&
         ssl->conf->max_early_data_size > 0) {
         if ((ret = mbedtls_ssl_tls13_write_early_data_ext(
-                 ssl, p, end, &output_len)) != 0) {
+                 ssl, p, end, &output_len, session)) != 0) {
             MBEDTLS_SSL_DEBUG_RET(
                 1, "mbedtls_ssl_tls13_write_early_data_ext", ret);
             return ret;