commit 8800136156816ac3d0313751eb6942a73fede607
author Darryl Green <darryl.green@arm.com> Thu Jul 26 13:59:04 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Fri Sep 14 10:02:28 2018 +0100
tree 3557710486b9b9ba71c152ba700d49305ed082c3
parent 8be946d6021ce07be1b4d9b8751273b1582c1b4b

Fix key parameter in psa_key_derivation to use correct type

include/psa/crypto.h

diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index 0ba3492..9f0b135 100644
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -2724,7 +2724,7 @@
  * \retval #PSA_ERROR_TAMPERING_DETECTED
  */
 psa_status_t psa_key_derivation(psa_crypto_generator_t *generator,
-                                psa_key_type_t key,
+                                psa_key_slot_t key,
                                 psa_algorithm_t alg,
                                 const uint8_t *salt,
                                 size_t salt_length,

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index a62fac7..210fa5f 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3257,7 +3257,7 @@
 }
 
 psa_status_t psa_key_derivation( psa_crypto_generator_t *generator,
-                                 psa_key_type_t key,
+                                 psa_key_slot_t key,
                                  psa_algorithm_t alg,
                                  const uint8_t *salt,
                                  size_t salt_length,