lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-09-04 03:22:10 +03:00
Code Activity

tests: ssl: Improve early data test code

Browse Source 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron
2024-03-08 11:40:07 +01:00
parent 1a13e2f43e
commit 4facb0a9cd
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/suites/test_suite_ssl.function
View File

@@ -37,7 +37,7 @@ static int write_early_data(mbedtls_ssl_context *ssl,
int ret = mbedtls_ssl_get_max_out_record_payload(ssl); int ret = mbedtls_ssl_get_max_out_record_payload(ssl);
TEST_ASSERT(ret > 0); TEST_ASSERT(ret > 0);
TEST_ASSERT(len <= (size_t) ret); TEST_LE_U(len, (size_t) ret);
ret = mbedtls_ssl_flush_output(ssl); ret = mbedtls_ssl_flush_output(ssl);
TEST_EQUAL(ret, 0); TEST_EQUAL(ret, 0);
@@ -4514,7 +4514,7 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
uint32_t write_size = (uint32_t) write_size_arg; uint32_t write_size = (uint32_t) write_size_arg;
unsigned char *buf_read = NULL; unsigned char *buf_read = NULL;
uint32_t read_size; uint32_t read_size;
uint32_t expended_early_data_len = 0; uint32_t expanded_early_data_chunk_size = 0;
uint32_t written_early_data_size = 0; uint32_t written_early_data_size = 0;
uint32_t max_early_data_size; uint32_t max_early_data_size;
@@ -4634,13 +4634,13 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
/* /*
* If the server rejected early data, base the determination of when * If the server rejected early data, base the determination of when
* to stop the loop on the expended size (padding and encryption * to stop the loop on the expanded size (padding and encryption
* expansion) of early data on server side and the number of early data * expansion) of early data on server side and the number of early data
* received so far by the server (multiple of the expended size). * received so far by the server (multiple of the expanded size).
*/ */
if ((expended_early_data_len != 0) && if ((expanded_early_data_chunk_size != 0) &&
((server_ep.ssl.total_early_data_size + ((server_ep.ssl.total_early_data_size +
expended_early_data_len) > max_early_data_size)) { expanded_early_data_chunk_size) > max_early_data_size)) {
break; break;
} }
@@ -4703,12 +4703,12 @@ void tls13_srv_max_early_data_size(int scenario, int max_early_data_size_arg, in
TEST_EQUAL(server_pattern.counter, 1); TEST_EQUAL(server_pattern.counter, 1);
server_pattern.counter = 0; server_pattern.counter = 0;
if (expended_early_data_len == 0) { if (expanded_early_data_chunk_size == 0) {
expended_early_data_len = server_ep.ssl.total_early_data_size; expanded_early_data_chunk_size = server_ep.ssl.total_early_data_size;
} }
break; break;
} }
TEST_ASSERT(server_ep.ssl.total_early_data_size <= max_early_data_size); TEST_LE_U(server_ep.ssl.total_early_data_size, max_early_data_size);
} while (1); } while (1);
mbedtls_debug_set_threshold(3); mbedtls_debug_set_threshold(3);