commit ed73b04c6ecc67c9ab47246d7669313cb4dede78
author Janos Follath <janos.follath@arm.com> Tue Jul 30 13:51:41 2019 +0100
committer Janos Follath <janos.follath@arm.com> Fri Aug 16 13:36:15 2019 +0100
tree 689e2d9fe6133baf9bb2a527b52fec6a684e951e
parent bd096101b5fb292642b15a0255800dc6f3664f17

Update psa_import_key to PSA 1.0

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 944907d..8f384c4 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -630,7 +630,7 @@
 {
     psa_status_t status;
     psa_algorithm_t alg;
-    psa_key_policy_t policy;
+    psa_key_attributes_t attributes;
     psa_key_handle_t master_slot;
     psa_key_derivation_operation_t generator =
         PSA_KEY_DERIVATION_OPERATION_INIT;
@@ -643,15 +643,12 @@
     else
         alg = PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256);
 
-    policy = psa_key_policy_init();
-    psa_key_policy_set_usage( &policy,
-                              PSA_KEY_USAGE_DERIVE,
-                              alg );
-    status = psa_set_key_policy( master_slot, &policy );
-    if( status != PSA_SUCCESS )
-        return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
+    attributes = psa_key_attributes_init();
+    psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_DERIVE );
+    psa_set_key_algorithm( &attributes, alg );
+    psa_set_key_type( &attributes, PSA_KEY_TYPE_DERIVE );
 
-    status = psa_import_key( master_slot, PSA_KEY_TYPE_DERIVE, secret, slen );
+    status = psa_import_key( &attributes, secret, slen, &master_slot );
     if( status != PSA_SUCCESS )
         return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );