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

Merge pull request #10120 from gilles-peskine-arm/test_suite_ssl-fix-ret-20250408

Browse Source 
Fix uncaught failure conditions in test_suite_ssl
This commit is contained in:
Gilles Peskine
2025-04-23 16:42:20 +00:00
committed by GitHub
parent 232da48471 946bf14608
commit 97c45bb2e0
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,6 +611,7 @@ int mbedtls_test_ssl_endpoint_certificate_init(mbedtls_test_ssl_endpoint *ep,
{
int i = 0;
int ret = -1;
int ok = 0;
mbedtls_test_ssl_endpoint_certificate *cert = NULL;
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_svc_key_id_t key_slot = MBEDTLS_SVC_KEY_ID_INIT;
@@ -733,7 +734,13 @@ int mbedtls_test_ssl_endpoint_certificate_init(mbedtls_test_ssl_endpoint *ep,
cert->pkey);
TEST_ASSERT(ret == 0);
ok = 1;
exit:
if (ret == 0 && !ok) {
/* Exiting due to a test assertion that isn't ret == 0 */
ret = -1;
}
if (ret != 0) {
test_ssl_endpoint_certificate_free(ep);
}
@@ -865,6 +872,7 @@ int mbedtls_test_ssl_endpoint_init(
if (MBEDTLS_SSL_IS_CLIENT == endpoint_type) {
ret = mbedtls_ssl_set_hostname(&(ep->ssl), "localhost");
TEST_EQUAL(ret, 0);
}
#if defined(MBEDTLS_SSL_PROTO_DTLS) && defined(MBEDTLS_SSL_SRV_C)
@@ -901,7 +909,13 @@ int mbedtls_test_ssl_endpoint_init(
TEST_EQUAL(mbedtls_ssl_get_user_data_n(&ep->ssl), user_data_n);
mbedtls_ssl_set_user_data_p(&ep->ssl, ep);
return 0;
exit:
if (ret == 0) {
/* Exiting due to a test assertion that isn't ret == 0 */
ret = -1;
}
return ret;
}
@@ -2598,6 +2612,7 @@ int mbedtls_test_get_tls13_ticket(
mbedtls_ssl_session *session)
{
int ret = -1;
int ok = 0;
unsigned char buf[64];
mbedtls_test_ssl_endpoint client_ep, server_ep;
@@ -2634,10 +2649,16 @@ int mbedtls_test_get_tls13_ticket(
ret = mbedtls_ssl_get_session(&(client_ep.ssl), session);
TEST_EQUAL(ret, 0);
ok = 1;
exit:
mbedtls_test_ssl_endpoint_free(&client_ep, NULL);
mbedtls_test_ssl_endpoint_free(&server_ep, NULL);
if (ret == 0 && !ok) {
/* Exiting due to a test assertion that isn't ret == 0 */
ret = -1;
}
return ret;
}
#endif /* MBEDTLS_SSL_CLI_C && MBEDTLS_SSL_SRV_C &&