diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h index 15bd6fd7d3..9a66663318 100644 --- a/include/mbedtls/ssl.h +++ b/include/mbedtls/ssl.h @@ -1869,7 +1869,7 @@ struct mbedtls_ssl_context { */ 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 */ /* diff --git a/library/ssl_msg.c b/library/ssl_msg.c index c61a7bf44d..52bd826b91 100644 --- a/library/ssl_msg.c +++ b/library/ssl_msg.c @@ -6130,7 +6130,7 @@ int mbedtls_ssl_write_early_data(mbedtls_ssl_context *ssl, } 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 @@ int mbedtls_ssl_write_early_data(mbedtls_ssl_context *ssl, } 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)); diff --git a/library/ssl_tls.c b/library/ssl_tls.c index ee72179997..5bedd91389 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1105,7 +1105,7 @@ static int ssl_handshake_init(mbedtls_ssl_context *ssl) #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 */ diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function index 682de08de1..6895efa5e5 100644 --- a/tests/suites/test_suite_ssl.function +++ b/tests/suites/test_suite_ssl.function @@ -4552,7 +4552,7 @@ void tls13_cli_max_early_data_size(int max_early_data_size_arg) */ 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 @@ void tls13_cli_max_early_data_size(int max_early_data_size_arg) 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);