commit de9b03dcbaf998b58fd4aa28743b8a2883695dec
author Ronald Cron <ronald.cron@arm.com> Fri Mar 01 15:14:17 2024 +0100
committer Ronald Cron <ronald.cron@arm.com> Fri Mar 01 15:14:17 2024 +0100
tree cd1f85b511c3a6157acd71ded87deb92a2137715
parent aad8523764e2d48a2e7f814f98caa4ba45413015

tls13: Rename early_data_count to total_early_data_size

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 15bd6fd..9a66663 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1869,7 +1869,7 @@
      */
     uint8_t MBEDTLS_PRIVATE(discard_early_data_record);
 #endif
-    uint32_t MBEDTLS_PRIVATE(early_data_count);  /*!< Number of received/written early data bytes */
+    uint32_t MBEDTLS_PRIVATE(total_early_data_size); /*!< Number of received/written early data bytes */
 #endif /* MBEDTLS_SSL_EARLY_DATA */
 
     /*

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index c61a7bf..52bd826 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -6130,7 +6130,7 @@
         }
 
         remaining = ssl->session_negotiate->max_early_data_size -
-                    ssl->early_data_count;
+                    ssl->total_early_data_size;
 
         if (remaining == 0) {
             return MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA;
@@ -6154,7 +6154,7 @@
     }
 
     written_data_len = ssl_write_real(ssl, buf, len);
-    ssl->early_data_count += written_data_len;
+    ssl->total_early_data_size += written_data_len;
 
     MBEDTLS_SSL_DEBUG_MSG(2, ("<= write early_data, len=%d", written_data_len));
 

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ee72179..5bedd91 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1105,7 +1105,7 @@
 #if defined(MBEDTLS_SSL_SRV_C)
     ssl->discard_early_data_record = MBEDTLS_SSL_EARLY_DATA_NO_DISCARD;
 #endif
-    ssl->early_data_count = 0;
+    ssl->total_early_data_size = 0;
 #endif /* MBEDTLS_SSL_EARLY_DATA */
 
     /* Initialize structures */

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 682de08..6895efa 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -4552,7 +4552,7 @@
      */
     ret = mbedtls_ssl_write_early_data(&(client_ep.ssl), buf, 1);
     TEST_EQUAL(ret, MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA);
-    TEST_EQUAL(client_ep.ssl.early_data_count, max_early_data_size);
+    TEST_EQUAL(client_ep.ssl.total_early_data_size, max_early_data_size);
     TEST_EQUAL(client_ep.ssl.early_data_status,
                MBEDTLS_SSL_EARLY_DATA_STATUS_CAN_WRITE);
 
@@ -4585,7 +4585,7 @@
 
     ret = mbedtls_ssl_write_early_data(&(client_ep.ssl), buf, 1);
     TEST_EQUAL(ret, MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA);
-    TEST_EQUAL(client_ep.ssl.early_data_count, max_early_data_size);
+    TEST_EQUAL(client_ep.ssl.total_early_data_size, max_early_data_size);
     TEST_EQUAL(client_ep.ssl.early_data_status,
                MBEDTLS_SSL_EARLY_DATA_STATUS_CAN_WRITE);