commit 51aa52eba4d9b53ddcc1f39d297d0d78b8ef61a4
author Valerio Setti <valerio.setti@nordicsemi.no> Wed May 24 12:37:50 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Wed May 24 14:00:09 2023 +0200
tree 1ea3f1971d227155a34b31a3ba78df695f49b1b8
parent 7ef8a8d0dac58f6a5df44dfa2e71e085177c471a

pk: fix key properties when importing private key

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 18b40ce..e70953e 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -642,16 +642,9 @@
     psa_status_t status;
 
     psa_set_key_type(&attributes, PSA_KEY_TYPE_ECC_KEY_PAIR(pk->ec_family));
-    /* Setting largest masks for usage and key algorithms */
-    psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_SIGN_HASH |
-                            PSA_KEY_USAGE_SIGN_MESSAGE |
-                            PSA_KEY_USAGE_EXPORT);
-#if defined(MBEDTLS_ECDSA_DETERMINISTIC)
-    psa_set_key_algorithm(&attributes,
-                          PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_ANY_HASH));
-#else
-    psa_set_key_algorithm(&attributes, PSA_ALG_ECDSA(PSA_ALG_ANY_HASH));
-#endif
+    psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_EXPORT |
+                            PSA_KEY_USAGE_DERIVE);
+    psa_set_key_algorithm(&attributes, PSA_ALG_ECDH);
 
     status = psa_import_key(&attributes, key, len, &pk->priv_id);
     if (status != PSA_SUCCESS) {
@@ -1304,13 +1297,14 @@
     /* Setting largest masks for usage and key algorithms */
     psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_SIGN_HASH |
                             PSA_KEY_USAGE_SIGN_MESSAGE |
-                            PSA_KEY_USAGE_EXPORT);
+                            PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_DERIVE);
 #if defined(MBEDTLS_ECDSA_DETERMINISTIC)
     psa_set_key_algorithm(&attributes,
                           PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_ANY_HASH));
 #else
     psa_set_key_algorithm(&attributes, PSA_ALG_ECDSA(PSA_ALG_ANY_HASH));
 #endif
+    psa_set_key_enrollment_algorithm(&attributes, PSA_ALG_ECDH);
 
     status = psa_import_key(&attributes, priv_key_raw, priv_key_len,
                             &pk->priv_id);