commit 680d5bbb688e22837e4d41d5a66021d01acd7fc3
author David Horstmann <david.horstmann@arm.com> Wed Jan 15 11:01:40 2025 +0000
committer GitHub <noreply@github.com> Wed Jan 15 11:01:40 2025 +0000
tree 283e46b40315f9ca266d9eb483a9deb88a42f69a
parent d975184ef5e7cec347bd6edf70e6d89aee4186e6
parent abf9f1aaa54b7f96d8f043ba61db80c31e8b890d

Merge pull request #9890 from gilles-peskine-arm/psa-storage-test-cases-never-supported-negative-preamble-3.6

PSA interruptible sign/verify: detect invalid curve family in start

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2bbe3a5..b576f95 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3969,9 +3969,13 @@
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     size_t required_hash_length;
 
-    if (!PSA_KEY_TYPE_IS_ECC(attributes->type)) {
+    if (!PSA_KEY_TYPE_IS_ECC_KEY_PAIR(attributes->type)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
+    psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(attributes->type);
+    if (!PSA_ECC_FAMILY_IS_WEIERSTRASS(curve)) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
 
     if (!can_do_interruptible_sign_verify(alg)) {
         return PSA_ERROR_NOT_SUPPORTED;
@@ -4188,6 +4192,10 @@
     if (!PSA_KEY_TYPE_IS_ECC(attributes->type)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
+    psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(attributes->type);
+    if (!PSA_ECC_FAMILY_IS_WEIERSTRASS(curve)) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
 
     if (!can_do_interruptible_sign_verify(alg)) {
         return PSA_ERROR_NOT_SUPPORTED;