mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 13:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pk/test_suite_pk: fix guards

Browse Source 
pk: mbedtls_pk_can_do_ext() should be guarded by CRYPTO_CLIENT instead
    of CRYPTO_C.

test: since the functions using opaque keys are now guarded by CRYPTO_C
      and since CRYPTO_CLIENT is automatically enabled as soon as
      CRYPTO_C is, then CRYPTO_CLIENT guards can be removed.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-02-22 14:45:02 +01:00
parent 6f430b2923
commit 50122b6e40
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/pk.c
View File

@ -238,7 +238,7 @@ int mbedtls_pk_can_do(const mbedtls_pk_context *ctx, mbedtls_pk_type_t type)
return ctx->pk_info->can_do(type);
}
#if defined(MBEDTLS_PSA_CRYPTO_C)
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
/*
* Tell if a PK can do the operations of the given PSA algorithm
*/
@ -376,7 +376,7 @@ int mbedtls_pk_can_do_ext(const mbedtls_pk_context *ctx, psa_algorithm_t alg,
return 0;
}
#endif /* MBEDTLS_PSA_CRYPTO_C */
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
#if defined(MBEDTLS_PSA_CRYPTO_C)
#if defined(MBEDTLS_RSA_C)

8
tests/suites/test_suite_pk.function
View File

@ -741,10 +741,8 @@ exit:
void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
{
mbedtls_pk_context pub, prv, alt;
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
mbedtls_svc_key_id_t opaque_key_id = MBEDTLS_SVC_KEY_ID_INIT;
int opaque_ret = ret;
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
mbedtls_pk_init(&pub);
mbedtls_pk_init(&prv);
@ -762,9 +760,7 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
#if defined(MBEDTLS_USE_PSA_CRYPTO)
ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
opaque_ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
#endif
}
TEST_ASSERT(mbedtls_pk_parse_public_keyfile(&pub, pub_file) == 0);
@ -786,7 +782,6 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
== ret);
}
#endif
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
if (mbedtls_pk_get_type(&prv) == MBEDTLS_PK_ECKEY) {
if (ret == MBEDTLS_ERR_ECP_BAD_INPUT_DATA) {
ret = MBEDTLS_ERR_PK_BAD_INPUT_DATA;
@ -797,12 +792,9 @@ void mbedtls_pk_check_pair(char *pub_file, char *prv_file, int ret)
TEST_EQUAL(mbedtls_pk_check_pair(&pub, &prv, mbedtls_test_rnd_std_rand,
NULL), opaque_ret);
}
#endif
exit:
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
psa_destroy_key(opaque_key_id);
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
mbedtls_pk_free(&pub);
mbedtls_pk_free(&prv);
mbedtls_pk_free(&alt);