test_suite_pk: replace USE_PSA with CRYPTO_CLIENT in tests with opaque keys
This commit also resolves upcoming issues found in pk_internal.h and
pkwrite.c.
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
diff --git a/library/pkwrite.c b/library/pkwrite.c
index b9ddcf1..16af2b6 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -348,7 +348,7 @@
/******************************************************************************
* Internal functions for Opaque keys.
******************************************************************************/
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
static int pk_write_opaque_pubkey(unsigned char **p, unsigned char *start,
const mbedtls_pk_context *pk)
{
@@ -370,7 +370,7 @@
return (int) len;
}
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
+#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
/******************************************************************************
* Generic helpers
@@ -382,7 +382,7 @@
{
mbedtls_pk_type_t pk_type = mbedtls_pk_get_type(pk);
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
if (pk_type == MBEDTLS_PK_OPAQUE) {
psa_key_attributes_t opaque_attrs = PSA_KEY_ATTRIBUTES_INIT;
psa_key_type_t opaque_key_type;
@@ -424,11 +424,11 @@
MBEDTLS_ASN1_CHK_ADD(len, pk_write_ec_pubkey(p, start, key));
} else
#endif
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
+#if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
if (mbedtls_pk_get_type(key) == MBEDTLS_PK_OPAQUE) {
MBEDTLS_ASN1_CHK_ADD(len, pk_write_opaque_pubkey(p, start, key));
} else
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
+#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
return MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE;
return (int) len;