commit b80a94e2ea280322de8282969685ab564acb5201
author Janos Follath <janos.follath@arm.com> Wed Jun 12 15:54:46 2019 +0100
committer Janos Follath <janos.follath@arm.com> Wed Jun 26 09:15:08 2019 +0100
tree 85355bcdd682ac1745c85f5419f74fbf141e7865
parent 4b7effd35af523fbd9dcc163fb8e3bf99b946e01

Rename psa_key_derivation_input_raw

The function dispatches between all the available methods and
does not just handle the raw key derivation case like the name suggests.

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 1e20f47..96150f8 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4791,7 +4791,7 @@
 #endif /* PSA_PRE_1_0_KEY_DERIVATION */
 #endif /* MBEDTLS_MD_C */
 
-static psa_status_t psa_key_derivation_input_raw(
+static psa_status_t psa_key_derivation_input_internal(
     psa_key_derivation_operation_t *operation,
     psa_key_derivation_step_t step,
     const uint8_t *data,
@@ -4856,8 +4856,8 @@
         case PSA_KEY_DERIVATION_INPUT_SALT:
         case PSA_KEY_DERIVATION_INPUT_INFO:
         case PSA_KEY_DERIVATION_INPUT_SEED:
-            return( psa_key_derivation_input_raw( operation, step,
-                                                  data, data_length ) );
+            return( psa_key_derivation_input_internal( operation, step,
+                                                       data, data_length ) );
         default:
             return( PSA_ERROR_INVALID_ARGUMENT );
     }
@@ -4884,10 +4884,10 @@
      * and leak values derived from the key. So be conservative. */
     if( step != PSA_KEY_DERIVATION_INPUT_SECRET )
         return( PSA_ERROR_INVALID_ARGUMENT );
-    return( psa_key_derivation_input_raw( operation,
-                                          step,
-                                          slot->data.raw.data,
-                                          slot->data.raw.bytes ) );
+    return( psa_key_derivation_input_internal( operation,
+                                               step,
+                                               slot->data.raw.data,
+                                               slot->data.raw.bytes ) );
 }
 
 
@@ -4999,8 +4999,9 @@
 
     /* Step 2: set up the key derivation to generate key material from
      * the shared secret. */
-    status = psa_key_derivation_input_raw( operation, step,
-                                           shared_secret, shared_secret_length );
+    status = psa_key_derivation_input_internal( operation, step,
+                                                shared_secret,
+                                                shared_secret_length );
 
 exit:
     mbedtls_platform_zeroize( shared_secret, shared_secret_length );