commit 5a5a79ae2a8a82e7ad9c345e51ce3b5ab3c19dab
author Adrian L. Shaw <adrian.shaw@arm.com> Fri May 03 15:44:28 2019 +0100
committer Adrian L. Shaw <adrian.shaw@arm.com> Fri May 03 15:44:28 2019 +0100
tree 8b793547a47119a4597b457c809c322b9a62fbe4
parent 971bd69696452c32bca14a3fff1f4f34e0aefa81

Rename psa_generate_key() and psa_generator_import_key()

programs/psa/crypto_examples.c

diff --git a/programs/psa/crypto_examples.c b/programs/psa/crypto_examples.c
index 1a81f45..922a301 100644
--- a/programs/psa/crypto_examples.c
+++ b/programs/psa/crypto_examples.c
@@ -164,7 +164,7 @@
     psa_set_key_type( &attributes, PSA_KEY_TYPE_AES );
     psa_set_key_bits( &attributes, key_bits );
 
-    status = psa_generate_key( &attributes, &key_handle );
+    status = psa_generate_random_key( &attributes, &key_handle );
     ASSERT_STATUS( status, PSA_SUCCESS );
 
     status = cipher_encrypt( key_handle, alg, iv, sizeof( iv ),
@@ -215,7 +215,7 @@
     psa_set_key_type( &attributes, PSA_KEY_TYPE_AES );
     psa_set_key_bits( &attributes, key_bits );
 
-    status = psa_generate_key( &attributes, &key_handle );
+    status = psa_generate_random_key( &attributes, &key_handle );
     ASSERT_STATUS( status, PSA_SUCCESS );
 
     status = cipher_encrypt( key_handle, alg, iv, sizeof( iv ),
@@ -262,7 +262,7 @@
     psa_set_key_type( &attributes, PSA_KEY_TYPE_AES );
     psa_set_key_bits( &attributes, key_bits );
 
-    status = psa_generate_key( &attributes, &key_handle );
+    status = psa_generate_random_key( &attributes, &key_handle );
     ASSERT_STATUS( status, PSA_SUCCESS );
 
     status = cipher_encrypt( key_handle, alg, iv, sizeof( iv ),

programs/psa/key_ladder_demo.c

diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c
index 6d4c707..523668e 100644
--- a/programs/psa/key_ladder_demo.c
+++ b/programs/psa/key_ladder_demo.c
@@ -208,7 +208,7 @@
     psa_set_key_type( &attributes, PSA_KEY_TYPE_DERIVE );
     psa_set_key_bits( &attributes, PSA_BYTES_TO_BITS( KEY_SIZE_BYTES ) );
 
-    PSA_CHECK( psa_generate_key( &attributes, &key_handle ) );
+    PSA_CHECK( psa_generate_random_key( &attributes, &key_handle ) );
 
     PSA_CHECK( save_key( key_handle, key_file_name ) );
 
@@ -306,7 +306,7 @@
         *key_handle = 0;
         /* Use the generator obtained from the parent key to create
          * the next intermediate key. */
-        PSA_CHECK( psa_generator_import_key( &attributes, key_handle,
+        PSA_CHECK( psa_generate_derived_key( &attributes, key_handle,
                                              &generator ) );
         PSA_CHECK( psa_generator_abort( &generator ) );
     }
@@ -343,7 +343,7 @@
                    WRAPPING_KEY_SALT, WRAPPING_KEY_SALT_LENGTH,
                    NULL, 0,
                    PSA_BITS_TO_BYTES( WRAPPING_KEY_BITS ) ) );
-    PSA_CHECK( psa_generator_import_key( &attributes, wrapping_key_handle,
+    PSA_CHECK( psa_generate_derived_key( &attributes, wrapping_key_handle,
                                          &generator ) );
 
 exit: