ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-26 11:50:40 +08:00
Code Issues Releases Wiki Activity

tls13: Rename early_data_count to total_early_data_size

Browse Source 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2024-03-01 15:14:17 +01:00
parent aad8523764
commit de9b03dcba
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/ssl.h
View File

@ -1869,7 +1869,7 @@ struct mbedtls_ssl_context {
*/ */
uint8_t MBEDTLS_PRIVATE(discard_early_data_record); uint8_t MBEDTLS_PRIVATE(discard_early_data_record);
#endif #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 */ #endif /* MBEDTLS_SSL_EARLY_DATA */
/* /*

4
library/ssl_msg.c
View File

@ -6130,7 +6130,7 @@ int mbedtls_ssl_write_early_data(mbedtls_ssl_context *ssl,
} }
remaining = ssl->session_negotiate->max_early_data_size - remaining = ssl->session_negotiate->max_early_data_size -
ssl->early_data_count; ssl->total_early_data_size;
if (remaining == 0) { if (remaining == 0) {
return MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA; 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); 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)); MBEDTLS_SSL_DEBUG_MSG(2, ("<= write early_data, len=%d", written_data_len));

2
library/ssl_tls.c
View File

@ -1105,7 +1105,7 @@ static int ssl_handshake_init(mbedtls_ssl_context *ssl)
#if defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_SRV_C)
ssl->discard_early_data_record = MBEDTLS_SSL_EARLY_DATA_NO_DISCARD; ssl->discard_early_data_record = MBEDTLS_SSL_EARLY_DATA_NO_DISCARD;
#endif #endif
ssl->early_data_count = 0; ssl->total_early_data_size = 0;
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */
/* Initialize structures */ /* Initialize structures */

4
tests/suites/test_suite_ssl.function
View File

@ -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); ret = mbedtls_ssl_write_early_data(&(client_ep.ssl), buf, 1);
TEST_EQUAL(ret, MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA); 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, TEST_EQUAL(client_ep.ssl.early_data_status,
MBEDTLS_SSL_EARLY_DATA_STATUS_CAN_WRITE); 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); ret = mbedtls_ssl_write_early_data(&(client_ep.ssl), buf, 1);
TEST_EQUAL(ret, MBEDTLS_ERR_SSL_CANNOT_WRITE_EARLY_DATA); 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, TEST_EQUAL(client_ep.ssl.early_data_status,
MBEDTLS_SSL_EARLY_DATA_STATUS_CAN_WRITE); MBEDTLS_SSL_EARLY_DATA_STATUS_CAN_WRITE);