commit 242da1e2c29eb209dcf75d7219031b4386f5328f
author Hanno Becker <hanno.becker@arm.com> Fri Jan 25 14:29:12 2019 +0000
committer Hanno Becker <hanno.becker@arm.com> Fri Jan 25 14:36:28 2019 +0000
tree d17daac660b36104b1814b368509f9b855b9539e
parent 330b9a458624f139d9b804e24ff16ebe2bcf8a81

PSA: Adapt cipher.c, pk.c, pk_wrap.c to new key slot allocation API

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 03c0e06..b2cffcd 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -308,7 +308,7 @@
             return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
 
         /* Allocate a key slot to use. */
-        status = psa_allocate_key( key_type, key_bitlen, &cipher_psa->slot );
+        status = psa_allocate_key( &cipher_psa->slot );
         if( status != PSA_SUCCESS )
             return( MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED );
 

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 024dcdc..e25a5f2 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -576,7 +576,7 @@
                                  mbedtls_psa_parse_tls_ecc_group ( curve_id ) );
 
     /* allocate a key slot */
-    if( PSA_SUCCESS != psa_allocate_key( key_type, d_len * 8, &key ) )
+    if( PSA_SUCCESS != psa_allocate_key( &key ) )
         return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED );
 
     /* set policy */

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 08550d4..ea678a6 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -577,9 +577,7 @@
     psa_sig_md = PSA_ALG_ECDSA( psa_md );
     psa_type = PSA_KEY_TYPE_ECC_PUBLIC_KEY( curve );
 
-    if( ( ret = psa_allocate_key( psa_type,
-                                  MBEDTLS_PSA_ECC_KEY_BITS_OF_CURVE(curve),
-                                  &key_slot ) ) != PSA_SUCCESS )
+    if( ( ret = psa_allocate_key( &key_slot ) ) != PSA_SUCCESS )
           return( mbedtls_psa_err_translate_pk( ret ) );
 
     psa_key_policy_init( &policy );