commit 52504f85688431039b4bc49a8b903d532eb053bf
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jun 20 17:19:58 2024 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Aug 06 13:13:05 2024 +0200
tree 35a8b251600f6741575fd387c05ecd9c4181337f
parent 472c10f4a58a263b05bac9b18b3c091c776c428a

Rename internal function psa_key_production_parameters_are_default

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index a5b8557..1272c14 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -6415,7 +6415,7 @@
 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 @@
     }
 
     (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 @@
         }
     } 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;
     }
 

library/psa_crypto_core.h

diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h
index 45320aa..866f6cf 100644
--- a/library/psa_crypto_core.h
+++ b/library/psa_crypto_core.h
@@ -352,7 +352,7 @@
  * \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);
 

scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja

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 02d4d53..d3b7d6f 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 @@
 
 #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