commit 52e9548c227d659fb889d3a73657244608cf8d82
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Aug 03 10:22:41 2023 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Oct 16 10:27:22 2023 +0200
tree 51fb52a178b1860e7a63b3d76b34e42917c87de5
parent f1b7633443ef3c4709e594817fd7e57645404472

Fix check for format supported by PSA

For non-Weierstrass curves there's only one format and it's supported.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 820c8d1..b429951 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -302,8 +302,10 @@
 #if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
 
     /* Load the key */
-    if (*pub == 0x04) {
-        /* Uncompressed format, directly supported by PSA */
+    if (!PSA_ECC_FAMILY_IS_WEIERSTRASS(pk->ec_family) || *pub == 0x04) {
+        /* Format directly supported by PSA:
+         * - non-Weierstrass curves that only have one format;
+         * - uncompressed format for Weierstrass curves. */
         if (pub_len > sizeof(pk->pub_raw)) {
             return MBEDTLS_ERR_PK_BUFFER_TOO_SMALL;
         }