ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-25 18:03:15 +08:00
Code Issues Releases Wiki Activity

pk: replace CRYPTO_CLIENT guards with CRYPTO_C

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-02-09 11:35:42 +01:00
parent a41654d5b1
commit 01ba66d56e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/pk.h
View File

@ -390,7 +390,7 @@ int mbedtls_pk_setup_opaque(mbedtls_pk_context *ctx,
const mbedtls_svc_key_id_t key); const mbedtls_svc_key_id_t key);
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) #if defined(MBEDTLS_PSA_CRYPTO_C)
/** /**
* \brief Create a PK context starting from a key stored in PSA. * \brief Create a PK context starting from a key stored in PSA.
* This key: * This key:
@ -429,7 +429,7 @@ int mbedtls_pk_setup_opaque(mbedtls_pk_context *ctx,
* parameters are not correct. * parameters are not correct.
*/ */
int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk); int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk);
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */ #endif /* MBEDTLS_PSA_CRYPTO_C */
#if defined(MBEDTLS_PK_RSA_ALT_SUPPORT) #if defined(MBEDTLS_PK_RSA_ALT_SUPPORT)
/** /**

6
library/pk.c
View File

@ -27,7 +27,7 @@
#include "mbedtls/ecdsa.h" #include "mbedtls/ecdsa.h"
#endif #endif
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) #if defined(MBEDTLS_PSA_CRYPTO_C)
#include "psa_util_internal.h" #include "psa_util_internal.h"
#include "mbedtls/psa_util.h" #include "mbedtls/psa_util.h"
#endif #endif
@ -1378,7 +1378,7 @@ mbedtls_pk_type_t mbedtls_pk_get_type(const mbedtls_pk_context *ctx)
return ctx->pk_info->type; return ctx->pk_info->type;
} }
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) #if defined(MBEDTLS_PSA_CRYPTO_C)
int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk) int mbedtls_pk_copy_from_psa(mbedtls_svc_key_id_t key_id, mbedtls_pk_context *pk)
{ {
psa_status_t status; psa_status_t status;
@ -1502,6 +1502,6 @@ exit:
return ret; return ret;
} }
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */ #endif /* MBEDTLS_PSA_CRYPTO_C */
#endif /* MBEDTLS_PK_C */ #endif /* MBEDTLS_PK_C */

8
tests/suites/test_suite_pk.function
View File

@ -426,7 +426,7 @@ exit:
} }
#endif #endif
#if defined(MBEDTLS_PSA_CRYPTO_CLIENT) #if defined(MBEDTLS_PSA_CRYPTO_C)
mbedtls_svc_key_id_t pk_psa_pub_key_from_priv(mbedtls_svc_key_id_t priv_id, mbedtls_svc_key_id_t pk_psa_pub_key_from_priv(mbedtls_svc_key_id_t priv_id,
psa_key_type_t type, psa_key_usage_t usage, psa_key_type_t type, psa_key_usage_t usage,
psa_algorithm_t alg, size_t bits) psa_algorithm_t alg, size_t bits)
@ -515,7 +515,7 @@ mbedtls_svc_key_id_t pk_psa_genkey_rsa(void)
return key; return key;
} }
#endif /* MBEDTLS_PSA_CRYPTO_CLIENT */ #endif /* MBEDTLS_PSA_CRYPTO_C */
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES
@ -2245,7 +2245,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_CLIENT*/ /* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C*/
void pk_copy_from_psa_fail(void) void pk_copy_from_psa_fail(void)
{ {
mbedtls_pk_context pk_ctx; mbedtls_pk_context pk_ctx;
@ -2323,7 +2323,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_CLIENT*/ /* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_C*/
void pk_copy_from_psa_success(data_t *priv_key_data, int key_type_arg, void pk_copy_from_psa_success(data_t *priv_key_data, int key_type_arg,
int key_bits_arg, int key_usage_arg, int key_bits_arg, int key_usage_arg,
int key_alg_arg) int key_alg_arg)