commit f466a284c12b8843f7d488029886976f68d332b2
author Waleed Elmelegy <waleed.elmelegy@arm.com> Tue Dec 03 13:52:28 2024 +0000
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Mon Dec 09 18:12:16 2024 +0000
tree 5df7837bf7c9653564ff9f8f0fb4fd0e64be4f1e
parent 4cffd5d4f39e1d8797ef4e6c14fb8a600f8ac6f0

Fix checks for key type in psa_export_public_key_iop_setup()

Key type must be a key pair or public-key if not we return
PSA_ERROR_INVALID_ARGUMENT.

The key type must be ECC key as this is what we support for
now otherwise we return PSA_ERROR_NOT_SUPPORTED.

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>

tf-psa-crypto/core/psa_crypto.c

diff --git a/tf-psa-crypto/core/psa_crypto.c b/tf-psa-crypto/core/psa_crypto.c
index 13ab40a..a298fcc 100644
--- a/tf-psa-crypto/core/psa_crypto.c
+++ b/tf-psa-crypto/core/psa_crypto.c
@@ -1717,12 +1717,14 @@
 
     private_key_type = psa_get_key_type(&private_key_attributes);
 
-    if (!PSA_KEY_TYPE_IS_KEY_PAIR(private_key_type)) {
+    if (!PSA_KEY_TYPE_IS_KEY_PAIR(private_key_type) &&
+        !PSA_KEY_TYPE_IS_PUBLIC_KEY(private_key_type)) {
         status = PSA_ERROR_INVALID_ARGUMENT;
         goto exit;
     }
 
-    if (!PSA_KEY_TYPE_IS_ECC_KEY_PAIR(private_key_type)) {
+    if (!PSA_KEY_TYPE_IS_ECC_KEY_PAIR(private_key_type) &&
+        !PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY(private_key_type)) {
         status = PSA_ERROR_NOT_SUPPORTED;
         goto exit;
     }