commit 35ef36b62fc4bf4cb7d3d7777849ece063d84f78
author Gilles Peskine <Gilles.Peskine@arm.com> Thu May 16 19:42:05 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri May 17 10:56:57 2019 +0200
tree 91f4170d5192949732e5acc03a46de3532c93aab
parent c93b80c350eaff9dc6e754db2617c0b8a58fad40

Rename psa_generate_random_key back to psa_generate_key

generate_key is a more classical name. The longer name was only
introduced to avoid confusion with getting a key from a generator,
which is key derivation, but we no longer use the generator
terminology so this reason no longer applies.

perl -i -pe 's/psa_generate_random_key/psa_generate_key/g' $(git ls-files)

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 5fab162..ae93e8b 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5308,7 +5308,7 @@
 }
 #endif /* MBEDTLS_RSA_C && MBEDTLS_GENPRIME */
 
-static psa_status_t psa_generate_random_key_internal(
+static psa_status_t psa_generate_key_internal(
     psa_key_slot_t *slot, size_t bits,
     const uint8_t *domain_parameters, size_t domain_parameters_size )
 {
@@ -5414,7 +5414,7 @@
     return( PSA_SUCCESS );
 }
 
-psa_status_t psa_generate_random_key_to_handle( psa_key_handle_t handle,
+psa_status_t psa_generate_key_to_handle( psa_key_handle_t handle,
                                psa_key_type_t type,
                                size_t bits,
                                const void *extra,
@@ -5434,7 +5434,7 @@
         return( status );
 
     slot->type = type;
-    status = psa_generate_random_key_internal( slot, bits, extra, extra_size );
+    status = psa_generate_key_internal( slot, bits, extra, extra_size );
     if( status != PSA_SUCCESS )
         slot->type = 0;
 
@@ -5448,7 +5448,7 @@
     return( status );
 }
 
-psa_status_t psa_generate_random_key( const psa_key_attributes_t *attributes,
+psa_status_t psa_generate_key( const psa_key_attributes_t *attributes,
                                psa_key_handle_t *handle )
 {
     psa_status_t status;
@@ -5456,7 +5456,7 @@
     status = psa_start_key_creation( attributes, handle, &slot );
     if( status == PSA_SUCCESS )
     {
-        status = psa_generate_random_key_internal(
+        status = psa_generate_key_internal(
             slot, attributes->bits,
             attributes->domain_parameters, attributes->domain_parameters_size );
     }

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index cde368f..c20ff1e 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -3148,7 +3148,7 @@
             return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
 
         /* Generate ECDH private key. */
-        status = psa_generate_random_key_to_handle( handshake->ecdh_psa_privkey,
+        status = psa_generate_key_to_handle( handshake->ecdh_psa_privkey,
                           PSA_KEY_TYPE_ECC_KEY_PAIR( handshake->ecdh_psa_curve ),
                           MBEDTLS_PSA_ECC_KEY_BITS_OF_CURVE( handshake->ecdh_psa_curve ),
                           NULL, 0 );