mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-20 16:21:03 +00:00
Code Issues Actions Packages Projects 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-02-26 16:43:01 +01:00
parent 70eab45ba6
commit 19bfe0a631
4 changed files with 11 additions and 11 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);
#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 */
/*

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)
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 */

6
library/ssl_tls13_generic.c
View File

@ -1477,11 +1477,11 @@ int mbedtls_ssl_tls13_check_early_data_len(mbedtls_ssl_context *ssl,
*/
if (uint32_early_data_len >
(ssl->session_negotiate->max_early_data_size -
ssl->early_data_count)) {
ssl->total_early_data_size)) {
MBEDTLS_SSL_DEBUG_MSG(
2, ("EarlyData: Too much early data received, %u > %u",
ssl->early_data_count + uint32_early_data_len,
ssl->total_early_data_size + uint32_early_data_len,
ssl->session_negotiate->max_early_data_size));
MBEDTLS_SSL_PEND_FATAL_ALERT(
@ -1490,7 +1490,7 @@ int mbedtls_ssl_tls13_check_early_data_len(mbedtls_ssl_context *ssl,
return MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE;
}
ssl->early_data_count += uint32_early_data_len;
ssl->total_early_data_size += uint32_early_data_len;
return 0;
}

12
tests/suites/test_suite_ssl.function
View File

@ -4583,7 +4583,7 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
unsigned char buf_read[23];
uint32_t read_early_data_size = 0;
uint32_t remaining = max_early_data_size -
server_ep.ssl.early_data_count;
server_ep.ssl.total_early_data_size;
early_data_len = sizeof(buf_write);
/*
@ -4628,7 +4628,7 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
buf_write + read_early_data_size, ret);
read_early_data_size += ret;
TEST_EQUAL(server_ep.ssl.early_data_count,
TEST_EQUAL(server_ep.ssl.total_early_data_size,
written_early_data_size);
}
break;
@ -4651,22 +4651,22 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
TEST_EQUAL(server_pattern.counter, 1);
server_pattern.counter = 0;
if (expended_early_data_len == 0) {
expended_early_data_len = server_ep.ssl.early_data_count;
expended_early_data_len = server_ep.ssl.total_early_data_size;
}
remaining = max_early_data_size - server_ep.ssl.early_data_count;
remaining = max_early_data_size - server_ep.ssl.total_early_data_size;
if (expended_early_data_len > remaining) {
write_early_data_flag = 0;
}
break;
}
TEST_ASSERT(server_ep.ssl.early_data_count <= max_early_data_size);
TEST_ASSERT(server_ep.ssl.total_early_data_size <= max_early_data_size);
}
mbedtls_debug_set_threshold(3);
if (reach_max) {
TEST_EQUAL(server_ep.ssl.early_data_count, max_early_data_size);
TEST_EQUAL(server_ep.ssl.total_early_data_size, max_early_data_size);
}
ret = write_early_data(&(client_ep.ssl), buf_write, early_data_len);