From b02ee18e645433d948facc8dd9103a0743c60234 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Wed, 16 Mar 2022 10:30:41 +0800 Subject: [PATCH] replace use_psa_crypto with psa_crypto_c Signed-off-by: Jerry Yu --- include/mbedtls/check_config.h | 3 +-- include/mbedtls/psa_util.h | 4 ++-- library/pk.c | 4 ++-- library/pk_wrap.c | 4 ++-- library/pk_wrap.h | 9 +++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index 378fcef702..06ba6b7d44 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -649,8 +649,7 @@ #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \ ( ( !defined(MBEDTLS_HKDF_C) ) || \ ( !defined(MBEDTLS_SHA256_C) && !defined(MBEDTLS_SHA384_C) ) || \ - ( !defined(MBEDTLS_PSA_CRYPTO_C) ) || \ - ( !defined(MBEDTLS_USE_PSA_CRYPTO) ) ) + ( !defined(MBEDTLS_PSA_CRYPTO_C) ) ) #error "MBEDTLS_SSL_PROTO_TLS1_3 defined, but not all prerequisites" #endif diff --git a/include/mbedtls/psa_util.h b/include/mbedtls/psa_util.h index b4c7ba8a26..1aa365f1fc 100644 --- a/include/mbedtls/psa_util.h +++ b/include/mbedtls/psa_util.h @@ -29,7 +29,7 @@ #include "mbedtls/build_info.h" -#if defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3) +#if defined(MBEDTLS_PSA_CRYPTO_C) #include "psa/crypto.h" @@ -277,7 +277,7 @@ static inline psa_key_type_t mbedtls_psa_parse_tls_ecc_group( } #endif /* MBEDTLS_ECP_C */ -#endif /* MBEDTLS_USE_PSA_CRYPTO */ +#endif /* MBEDTLS_PSA_CRYPTO_C */ /* Expose whatever RNG the PSA subsystem uses to applications using the * mbedtls_xxx API. The declarations and definitions here need to be diff --git a/library/pk.c b/library/pk.c index 091cb6b831..4c3c7740b4 100644 --- a/library/pk.c +++ b/library/pk.c @@ -36,7 +36,7 @@ #include "mbedtls/ecdsa.h" #endif -#if defined(MBEDTLS_USE_PSA_CRYPTO) +#if defined(MBEDTLS_PSA_CRYPTO_C) #include "mbedtls/psa_util.h" #endif @@ -545,7 +545,7 @@ int mbedtls_pk_sign_ext( mbedtls_pk_type_t pk_type, sig, sig_size, sig_len, f_rng, p_rng ) ); } -#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) && defined(MBEDTLS_USE_PSA_CRYPTO) +#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) return( mbedtls_pk_psa_sign_ext( PSA_ALG_RSA_PSS( mbedtls_psa_translate_md( md_alg ) ), ctx->pk_ctx, hash, hash_len, diff --git a/library/pk_wrap.c b/library/pk_wrap.c index b910242441..4e84ae5db8 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -65,7 +65,7 @@ #include #include -#if defined(MBEDTLS_USE_PSA_CRYPTO) +#if defined(MBEDTLS_PSA_CRYPTO_C) int mbedtls_pk_error_from_psa( psa_status_t status ) { switch( status ) @@ -191,7 +191,7 @@ static int rsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg, return( 0 ); } -#if defined(MBEDTLS_USE_PSA_CRYPTO) +#if defined(MBEDTLS_PSA_CRYPTO_C) int mbedtls_pk_psa_sign_ext( psa_algorithm_t psa_alg_md, void *pk_ctx, const unsigned char *hash, size_t hash_len, unsigned char *sig, size_t sig_size, diff --git a/library/pk_wrap.h b/library/pk_wrap.h index eead322cbe..ae970f9af4 100644 --- a/library/pk_wrap.h +++ b/library/pk_wrap.h @@ -27,6 +27,10 @@ #include "mbedtls/pk.h" +#if defined(MBEDTLS_PSA_CRYPTO_C) +#include "psa/crypto.h" +#endif /* MBEDTLS_PSA_CRYPTO_C */ + struct mbedtls_pk_info_t { /** Public key type */ @@ -135,7 +139,7 @@ extern const mbedtls_pk_info_t mbedtls_rsa_alt_info; extern const mbedtls_pk_info_t mbedtls_pk_opaque_info; #endif -#if defined(MBEDTLS_USE_PSA_CRYPTO) +#if defined(MBEDTLS_PSA_CRYPTO_C) int mbedtls_pk_error_from_psa( psa_status_t status ); #if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY) @@ -146,9 +150,6 @@ int mbedtls_pk_error_from_psa_ecdca( psa_status_t status ); int mbedtls_pk_error_from_psa_rsa( psa_status_t status ); #endif -#endif /* MBEDTLS_USE_PSA_CRYPTO */ - -#if defined(MBEDTLS_USE_PSA_CRYPTO) int mbedtls_pk_psa_sign_ext( psa_algorithm_t psa_alg_md, void *ctx, const unsigned char *hash, size_t hash_len, unsigned char *sig, size_t sig_size,