From 5a68056755f6e75f281b4d2884cff72ca85ecd78 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 5 Aug 2019 17:32:13 +0200 Subject: [PATCH] Rename internal macro to pass check-names.sh check-names.sh rejects MBEDTLS_XXX identifiers that are not defined in a public header. --- library/psa_crypto.c | 4 ++-- library/psa_crypto_core.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index a54cd73bb..9f7b5cbc0 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -1433,9 +1433,9 @@ psa_status_t psa_export_public_key( psa_key_handle_t handle, #if defined(static_assert) static_assert( ( MBEDTLS_PSA_KA_MASK_EXTERNAL_ONLY & MBEDTLS_PSA_KA_MASK_DUAL_USE ) == 0, "One or more key attribute flag is listed as both external-only and dual-use" ); -static_assert( ( MBEDTLS_PSA_KA_MASK_INTERNAL_ONLY & MBEDTLS_PSA_KA_MASK_DUAL_USE ) == 0, +static_assert( ( PSA_KA_MASK_INTERNAL_ONLY & MBEDTLS_PSA_KA_MASK_DUAL_USE ) == 0, "One or more key attribute flag is listed as both external-only and dual-use" ); -static_assert( ( MBEDTLS_PSA_KA_MASK_INTERNAL_ONLY & MBEDTLS_PSA_KA_MASK_EXTERNAL_ONLY ) == 0, +static_assert( ( PSA_KA_MASK_INTERNAL_ONLY & MBEDTLS_PSA_KA_MASK_EXTERNAL_ONLY ) == 0, "One or more key attribute flag is listed as both internal-only and external-only" ); #endif diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h index b67c0c576..edf3ab603 100644 --- a/library/psa_crypto_core.h +++ b/library/psa_crypto_core.h @@ -68,7 +68,7 @@ typedef struct /* A mask of key attribute flags used only internally. * Currently there aren't any. */ -#define MBEDTLS_PSA_KA_MASK_INTERNAL_ONLY ( \ +#define PSA_KA_MASK_INTERNAL_ONLY ( \ 0 ) /** Test whether a key slot is occupied.