commit 89177e862b97f01d5adf78542af6ed25b4976044
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Dec 03 21:19:09 2019 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Jan 31 10:15:32 2020 +0100
tree ae567a2a77714bbb5535acf56c04e39cffafae91
parent 33b1c6990819a15f0324c160ba6a005d970ec464

Convert USE_PSA_CRYPTO pk interface to the new PSA EC curve encoding

library/pkwrite.c

diff --git a/library/pkwrite.c b/library/pkwrite.c
index 49a21bf..4fa5424 100644
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@@ -273,18 +273,20 @@
         psa_key_type_t key_type;
         psa_key_handle_t handle;
         psa_ecc_curve_t curve;
+        size_t bits;
 
         handle = *((psa_key_handle_t*) key->pk_ctx );
         if( PSA_SUCCESS != psa_get_key_attributes( handle, &attributes ) )
             return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED );
         key_type = psa_get_key_type( &attributes );
+        bits = psa_get_key_bits( &attributes );
         psa_reset_key_attributes( &attributes );
 
-        curve = PSA_KEY_TYPE_GET_CURVE( key_type );
+        curve = PSA_KEY_TYPE_GET_CURVE( key_type ) & 0xff0000;
         if( curve == 0 )
             return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
 
-        ret = mbedtls_psa_get_ecc_oid_from_id( curve, &oid, &oid_len );
+        ret = mbedtls_psa_get_ecc_oid_from_id( curve, bits, &oid, &oid_len );
         if( ret != 0 )
             return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );