ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-11 01:11:42 +08:00
Code Issues Releases Wiki Activity

Coding style cleanup

Browse Source 
Signed-off-by: Max Fillinger <max@max-fillinger.net>
This commit is contained in:
Max Fillinger 2024-10-30 00:49:10 +01:00 committed by Max Fillinger
parent e825110391
commit 538ed71ecb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/src/test_helpers/ssl_helpers.c
View File

@ -2070,15 +2070,20 @@ int mbedtls_test_ssl_do_handshake_with_endpoints(
return ret; return ret;
} }
ret = mbedtls_test_move_handshake_to_state(&server_ep->ssl, &client_ep->ssl, MBEDTLS_SSL_HANDSHAKE_OVER); ret = mbedtls_test_move_handshake_to_state(&server_ep->ssl,
&client_ep->ssl,
MBEDTLS_SSL_HANDSHAKE_OVER);
if (ret != 0 && ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) { if (ret != 0 && ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
return ret; return ret;
} }
ret = mbedtls_test_move_handshake_to_state(&client_ep->ssl, &server_ep->ssl, MBEDTLS_SSL_HANDSHAKE_OVER); ret = mbedtls_test_move_handshake_to_state(&client_ep->ssl,
&server_ep->ssl,
MBEDTLS_SSL_HANDSHAKE_OVER);
if (ret != 0 && ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) { if (ret != 0 && ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
return ret; return ret;
} }
if (!mbedtls_ssl_is_handshake_over(&client_ep->ssl) || !mbedtls_ssl_is_handshake_over(&server_ep->ssl)) { if (!mbedtls_ssl_is_handshake_over(&client_ep->ssl) ||
!mbedtls_ssl_is_handshake_over(&server_ep->ssl)) {
return -1; return -1;
} }

11
tests/suites/test_suite_ssl.function
View File

@ -5753,16 +5753,16 @@ void ssl_tls_exporter_consistent_result(int proto, int exported_key_length, int
char label[] = "test-label"; char label[] = "test-label";
unsigned char context[128] = { 0 }; unsigned char context[128] = { 0 };
ret = mbedtls_ssl_export_keying_material(&server_ep.ssl, ret = mbedtls_ssl_export_keying_material(&server_ep.ssl,
key_buffer_server, (size_t)exported_key_length, key_buffer_server, (size_t) exported_key_length,
label, sizeof(label), label, sizeof(label),
context, sizeof(context), use_context); context, sizeof(context), use_context);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ret = mbedtls_ssl_export_keying_material(&client_ep.ssl, ret = mbedtls_ssl_export_keying_material(&client_ep.ssl,
key_buffer_client, (size_t)exported_key_length, key_buffer_client, (size_t) exported_key_length,
label, sizeof(label), label, sizeof(label),
context, sizeof(context), use_context); context, sizeof(context), use_context);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
TEST_ASSERT(memcmp(key_buffer_server, key_buffer_client, (size_t)exported_key_length) == 0); TEST_ASSERT(memcmp(key_buffer_server, key_buffer_client, (size_t) exported_key_length) == 0);
exit: exit:
MD_OR_USE_PSA_DONE(); MD_OR_USE_PSA_DONE();
@ -5864,7 +5864,10 @@ void ssl_tls13_exporter_uses_length(void)
MD_OR_USE_PSA_INIT(); MD_OR_USE_PSA_INIT();
ret = mbedtls_test_ssl_do_handshake_with_endpoints(&server_ep, &client_ep, &options, MBEDTLS_SSL_VERSION_TLS1_3); ret = mbedtls_test_ssl_do_handshake_with_endpoints(&server_ep,
&client_ep,
&options,
MBEDTLS_SSL_VERSION_TLS1_3);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
char label[] = "test-label"; char label[] = "test-label";