cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-11 16:15:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

test: proper positioning of USE_PSA_INIT + fixed some exit labels

Browse Source 
Very partial backport of 32f2ac9a180e08c35f4643e8e969f864a2d79ada

Signed-off-by: valerio <valerio.setti@nordicsemi.no>
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
valerio 2023-04-20 11:59:52 +02:00 committed by Gilles Peskine
parent 11f41793f8
commit 5b5da941a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/suites/test_suite_ssl.function
View File

@ -1907,6 +1907,8 @@ void ssl_session_serialize_version_check(int corrupt_major,
*byte ^= corrupted_bit; *byte ^= corrupted_bit;
} }
} }
exit:
USE_PSA_DONE(); USE_PSA_DONE();
} }
/* END_CASE */ /* END_CASE */
@ -2269,8 +2271,10 @@ void cookie_parsing(data_t *cookie, int exp_ret)
size_t len; size_t len;
mbedtls_ssl_init(&ssl); mbedtls_ssl_init(&ssl);
USE_PSA_INIT();
mbedtls_ssl_config_init(&conf); mbedtls_ssl_config_init(&conf);
USE_PSA_INIT();
TEST_EQUAL(mbedtls_ssl_config_defaults(&conf, MBEDTLS_SSL_IS_SERVER, TEST_EQUAL(mbedtls_ssl_config_defaults(&conf, MBEDTLS_SSL_IS_SERVER,
MBEDTLS_SSL_TRANSPORT_DATAGRAM, MBEDTLS_SSL_TRANSPORT_DATAGRAM,
MBEDTLS_SSL_PRESET_DEFAULT), MBEDTLS_SSL_PRESET_DEFAULT),

6
tests/suites/test_suite_x509parse.function
View File

@ -431,7 +431,6 @@ void x509_parse_san(char *crt_file, char *result_str)
TEST_EQUAL(strcmp(buf, result_str), 0); TEST_EQUAL(strcmp(buf, result_str), 0);
exit: exit:
mbedtls_x509_crt_free(&crt); mbedtls_x509_crt_free(&crt);
USE_PSA_DONE(); USE_PSA_DONE();
} }
@ -864,9 +863,8 @@ void mbedtls_x509_get_name(char *rdn_sequence, int exp_ret)
TEST_EQUAL(ret, exp_ret); TEST_EQUAL(ret, exp_ret);
mbedtls_free(name);
exit: exit:
mbedtls_free(name);
USE_PSA_DONE(); USE_PSA_DONE();
} }
/* END_CASE */ /* END_CASE */
@ -1252,6 +1250,7 @@ void x509_oid_desc(data_t *buf, char *ref_desc)
int ret; int ret;
USE_PSA_INIT(); USE_PSA_INIT();
oid.tag = MBEDTLS_ASN1_OID; oid.tag = MBEDTLS_ASN1_OID;
oid.p = buf->x; oid.p = buf->x;
oid.len = buf->len; oid.len = buf->len;
@ -1279,6 +1278,7 @@ void x509_oid_numstr(data_t *oid_buf, char *numstr, int blen, int ret)
char num_buf[100]; char num_buf[100];
USE_PSA_INIT(); USE_PSA_INIT();
memset(num_buf, 0x2a, sizeof(num_buf)); memset(num_buf, 0x2a, sizeof(num_buf));
oid.tag = MBEDTLS_ASN1_OID; oid.tag = MBEDTLS_ASN1_OID;