mirror of
https://github.com/cuberite/polarssl.git
synced 2025-08-21 03:26:22 -04:00
test: update guards also for pkwrite and pkparse
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
parent
57456b343e
commit
d64e2493e1
@ -17,6 +17,7 @@ void pk_parse_keyfile_rsa(char *key_file, char *password, int result)
|
|||||||
char *pwd = password;
|
char *pwd = password;
|
||||||
|
|
||||||
mbedtls_pk_init(&ctx);
|
mbedtls_pk_init(&ctx);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
if (strcmp(pwd, "NULL") == 0) {
|
if (strcmp(pwd, "NULL") == 0) {
|
||||||
pwd = NULL;
|
pwd = NULL;
|
||||||
@ -35,6 +36,7 @@ void pk_parse_keyfile_rsa(char *key_file, char *password, int result)
|
|||||||
|
|
||||||
exit:
|
exit:
|
||||||
mbedtls_pk_free(&ctx);
|
mbedtls_pk_free(&ctx);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
@ -45,6 +47,7 @@ void pk_parse_public_keyfile_rsa(char *key_file, int result)
|
|||||||
int res;
|
int res;
|
||||||
|
|
||||||
mbedtls_pk_init(&ctx);
|
mbedtls_pk_init(&ctx);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
res = mbedtls_pk_parse_public_keyfile(&ctx, key_file);
|
res = mbedtls_pk_parse_public_keyfile(&ctx, key_file);
|
||||||
|
|
||||||
@ -59,6 +62,7 @@ void pk_parse_public_keyfile_rsa(char *key_file, int result)
|
|||||||
|
|
||||||
exit:
|
exit:
|
||||||
mbedtls_pk_free(&ctx);
|
mbedtls_pk_free(&ctx);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
@ -69,6 +73,7 @@ void pk_parse_public_keyfile_ec(char *key_file, int result)
|
|||||||
int res;
|
int res;
|
||||||
|
|
||||||
mbedtls_pk_init(&ctx);
|
mbedtls_pk_init(&ctx);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
res = mbedtls_pk_parse_public_keyfile(&ctx, key_file);
|
res = mbedtls_pk_parse_public_keyfile(&ctx, key_file);
|
||||||
|
|
||||||
@ -83,6 +88,7 @@ void pk_parse_public_keyfile_ec(char *key_file, int result)
|
|||||||
|
|
||||||
exit:
|
exit:
|
||||||
mbedtls_pk_free(&ctx);
|
mbedtls_pk_free(&ctx);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
@ -93,6 +99,7 @@ void pk_parse_keyfile_ec(char *key_file, char *password, int result)
|
|||||||
int res;
|
int res;
|
||||||
|
|
||||||
mbedtls_pk_init(&ctx);
|
mbedtls_pk_init(&ctx);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
res = mbedtls_pk_parse_keyfile(&ctx, key_file, password);
|
res = mbedtls_pk_parse_keyfile(&ctx, key_file, password);
|
||||||
|
|
||||||
@ -107,6 +114,7 @@ void pk_parse_keyfile_ec(char *key_file, char *password, int result)
|
|||||||
|
|
||||||
exit:
|
exit:
|
||||||
mbedtls_pk_free(&ctx);
|
mbedtls_pk_free(&ctx);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
@ -116,10 +124,12 @@ void pk_parse_key(data_t *buf, int result)
|
|||||||
mbedtls_pk_context pk;
|
mbedtls_pk_context pk;
|
||||||
|
|
||||||
mbedtls_pk_init(&pk);
|
mbedtls_pk_init(&pk);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
TEST_ASSERT(mbedtls_pk_parse_key(&pk, buf->x, buf->len, NULL, 0) == result);
|
TEST_ASSERT(mbedtls_pk_parse_key(&pk, buf->x, buf->len, NULL, 0) == result);
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
mbedtls_pk_free(&pk);
|
mbedtls_pk_free(&pk);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
@ -36,6 +36,9 @@ static void pk_write_check_common(char *key_file, int is_public_key, int is_der)
|
|||||||
size_t buf_len, check_buf_len;
|
size_t buf_len, check_buf_len;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
mbedtls_pk_init(&key);
|
||||||
|
USE_PSA_INIT();
|
||||||
|
|
||||||
/* Note: if mbedtls_pk_load_file() successfully reads the file, then
|
/* Note: if mbedtls_pk_load_file() successfully reads the file, then
|
||||||
it also allocates check_buf, which should be freed on exit */
|
it also allocates check_buf, which should be freed on exit */
|
||||||
TEST_EQUAL(mbedtls_pk_load_file(key_file, &check_buf, &check_buf_len), 0);
|
TEST_EQUAL(mbedtls_pk_load_file(key_file, &check_buf, &check_buf_len), 0);
|
||||||
@ -56,7 +59,6 @@ static void pk_write_check_common(char *key_file, int is_public_key, int is_der)
|
|||||||
|
|
||||||
ASSERT_ALLOC(buf, check_buf_len);
|
ASSERT_ALLOC(buf, check_buf_len);
|
||||||
|
|
||||||
mbedtls_pk_init(&key);
|
|
||||||
if (is_public_key) {
|
if (is_public_key) {
|
||||||
TEST_EQUAL(mbedtls_pk_parse_public_keyfile(&key, key_file), 0);
|
TEST_EQUAL(mbedtls_pk_parse_public_keyfile(&key, key_file), 0);
|
||||||
if (is_der) {
|
if (is_der) {
|
||||||
@ -97,6 +99,7 @@ exit:
|
|||||||
mbedtls_free(buf);
|
mbedtls_free(buf);
|
||||||
mbedtls_free(check_buf);
|
mbedtls_free(check_buf);
|
||||||
mbedtls_pk_free(&key);
|
mbedtls_pk_free(&key);
|
||||||
|
USE_PSA_DONE();
|
||||||
}
|
}
|
||||||
/* END_HEADER */
|
/* END_HEADER */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user