commit 6b062eeed0acedbeca4ae738723564ebeee5193c
author Valerio Setti <valerio.setti@nordicsemi.no> Fri Jun 30 17:32:57 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Tue Jul 11 11:28:22 2023 +0200
tree b8af9ca1f8f2e5eb2eec611e6bb1e6f5edcda253
parent 5f54020d1aec7e18417dc955490a394bdea97d9b

pkparse: parse also Weierstrass private keys using ecp_read_key()

This is to hanlde more uniformly Weierstrass and Montgomery curves.

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

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 7f2816b..1091c42 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1217,15 +1217,11 @@
         return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret);
     }
 
+    /* Keep a reference to the position fo the private key. It will be used
+     * later in this function. */
     d = p;
     d_len = len;
 
-#if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
-    if ((ret = mbedtls_mpi_read_binary(&eck->d, p, len)) != 0) {
-        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret);
-    }
-#endif
-
     p += len;
 
     pubkey_done = 0;
@@ -1245,6 +1241,13 @@
         }
     }
 
+
+#if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
+    if ((ret = mbedtls_ecp_read_key(eck->grp.id, eck, d, d_len)) != 0) {
+        return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret);
+    }
+#endif
+
     if (p != end) {
         /*
          * Is 'publickey' present? If not, or if we can't read it (eg because it