mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-05-11 06:28:17 +02:00
test: proper positioning of USE_PSA_INIT + fixed some exit labels
Very partial backport of 32f2ac9a18
Signed-off-by: valerio <valerio.setti@nordicsemi.no>
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
@@ -1907,6 +1907,8 @@ void ssl_session_serialize_version_check(int corrupt_major,
|
||||
*byte ^= corrupted_bit;
|
||||
}
|
||||
}
|
||||
|
||||
exit:
|
||||
USE_PSA_DONE();
|
||||
}
|
||||
/* END_CASE */
|
||||
@@ -2269,8 +2271,10 @@ void cookie_parsing(data_t *cookie, int exp_ret)
|
||||
size_t len;
|
||||
|
||||
mbedtls_ssl_init(&ssl);
|
||||
USE_PSA_INIT();
|
||||
mbedtls_ssl_config_init(&conf);
|
||||
|
||||
USE_PSA_INIT();
|
||||
|
||||
TEST_EQUAL(mbedtls_ssl_config_defaults(&conf, MBEDTLS_SSL_IS_SERVER,
|
||||
MBEDTLS_SSL_TRANSPORT_DATAGRAM,
|
||||
MBEDTLS_SSL_PRESET_DEFAULT),
|
||||
|
||||
@@ -431,7 +431,6 @@ void x509_parse_san(char *crt_file, char *result_str)
|
||||
TEST_EQUAL(strcmp(buf, result_str), 0);
|
||||
|
||||
exit:
|
||||
|
||||
mbedtls_x509_crt_free(&crt);
|
||||
USE_PSA_DONE();
|
||||
}
|
||||
@@ -864,9 +863,8 @@ void mbedtls_x509_get_name(char *rdn_sequence, int exp_ret)
|
||||
|
||||
TEST_EQUAL(ret, exp_ret);
|
||||
|
||||
mbedtls_free(name);
|
||||
|
||||
exit:
|
||||
mbedtls_free(name);
|
||||
USE_PSA_DONE();
|
||||
}
|
||||
/* END_CASE */
|
||||
@@ -1252,6 +1250,7 @@ void x509_oid_desc(data_t *buf, char *ref_desc)
|
||||
int ret;
|
||||
|
||||
USE_PSA_INIT();
|
||||
|
||||
oid.tag = MBEDTLS_ASN1_OID;
|
||||
oid.p = buf->x;
|
||||
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];
|
||||
|
||||
USE_PSA_INIT();
|
||||
|
||||
memset(num_buf, 0x2a, sizeof(num_buf));
|
||||
|
||||
oid.tag = MBEDTLS_ASN1_OID;
|
||||
|
||||
Reference in New Issue
Block a user