From 52504f85688431039b4bc49a8b903d532eb053bf Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 20 Jun 2024 17:19:58 +0200 Subject: [PATCH] Rename internal function psa_key_production_parameters_are_default Signed-off-by: Gilles Peskine --- library/psa_crypto.c | 6 +++--- library/psa_crypto_core.h | 2 +- .../driver_templates/psa_crypto_driver_wrappers.h.jinja | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index a5b85578b4..1272c1458b 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -6415,7 +6415,7 @@ exit: static const psa_custom_key_parameters_t default_custom_production = PSA_KEY_PRODUCTION_PARAMETERS_INIT; -int psa_key_production_parameters_are_default( +int psa_custom_key_parameters_are_default( const psa_custom_key_parameters_t *custom, size_t custom_data_length) { @@ -6449,7 +6449,7 @@ psa_status_t psa_key_derivation_output_key_custom( } (void) custom_data; /* We only accept 0-length data */ - if (!psa_key_production_parameters_are_default(custom, custom_data_length)) { + if (!psa_custom_key_parameters_are_default(custom, custom_data_length)) { return PSA_ERROR_INVALID_ARGUMENT; } @@ -7972,7 +7972,7 @@ psa_status_t psa_generate_key_custom(const psa_key_attributes_t *attributes, } } else #endif - if (!psa_key_production_parameters_are_default(custom, custom_data_length)) { + if (!psa_custom_key_parameters_are_default(custom, custom_data_length)) { return PSA_ERROR_INVALID_ARGUMENT; } diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h index 45320aac84..866f6cf41a 100644 --- a/library/psa_crypto_core.h +++ b/library/psa_crypto_core.h @@ -352,7 +352,7 @@ psa_status_t psa_export_public_key_internal( * \param custom_data_length Size of the associated variable-length data * in bytes. */ -int psa_key_production_parameters_are_default( +int psa_custom_key_parameters_are_default( const psa_custom_key_parameters_t *custom, size_t custom_data_length); diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja index 02d4d539f7..d3b7d6fb31 100644 --- a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja +++ b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja @@ -741,7 +741,7 @@ static inline psa_status_t psa_driver_wrapper_generate_key( #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE) int is_default_production = - psa_key_production_parameters_are_default(custom, custom_data_length); + psa_custom_key_parameters_are_default(custom, custom_data_length); if( location != PSA_KEY_LOCATION_LOCAL_STORAGE && !is_default_production ) { /* We don't support passing custom production parameters