commit 1ec0fee4589753364cf785f47696b279b067e026
author Andrzej Kurek <andrzej.kurek@mobica.com> Mon Jan 14 05:09:46 2019 -0500
committer Andrzej Kurek <andrzej.kurek@mobica.com> Wed Jan 23 06:23:12 2019 -0500
tree de50bc8b0760fc86f50ebe4169c75325bcd1e69b
parent 08dfceaba42192537d8b6eede9fc6c16820fd1c4

pk: wrap curve_id before passing it to PSA

Add a helper function in PSA utils

include/mbedtls/psa_util.h

diff --git a/include/mbedtls/psa_util.h b/include/mbedtls/psa_util.h
index f17e6af..435aca8 100644
--- a/include/mbedtls/psa_util.h
+++ b/include/mbedtls/psa_util.h
@@ -244,6 +244,19 @@
     }
 }
 
+/* Translations for ECC */
+
+/* This function transforms an ECC group identifier from
+ * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8
+ * into a PSA ECC group identifier. */
+static inline psa_ecc_curve_t mbedtls_psa_parse_tls_ecc_group(
+    uint16_t tls_ecc_grp_reg_id )
+{
+    /* The PSA identifiers are currently aligned with those from
+     * the TLS Supported Groups registry, so no conversion is necessary. */
+    return( (psa_ecc_curve_t) tls_ecc_grp_reg_id );
+}
+
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
 #endif /* MBEDTLS_PSA_UTIL_H */

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 8f649f9..c0ed542 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -572,7 +572,8 @@
         return( ret );
 
     curve_id = mbedtls_ecp_curve_info_from_grp_id( ec->grp.id )->tls_id;
-    key_type = PSA_KEY_TYPE_ECC_KEYPAIR(curve_id);
+    key_type = PSA_KEY_TYPE_ECC_KEYPAIR(
+    		                     mbedtls_psa_parse_tls_ecc_group ( curve_id ) );
 
     /* allocate a key slot */
     if( PSA_SUCCESS != psa_allocate_key( key_type, d_len * 8, &key ) )