commit 21d42417f949fe01745870eb02b25c13bf413fdf
author Valerio Setti <valerio.setti@nordicsemi.no> Fri Jun 30 17:37:23 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Tue Jul 11 11:28:22 2023 +0200
tree d079e768754a08b26e63f24dc7c671ce528a1f39
parent 6b062eeed0acedbeca4ae738723564ebeee5193c

pkparse: always check all private keys on import

This allows to remove explicit calls to mbedtls_ecp_check_privkey()
in pkparse.c.

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

library/ecp.c

diff --git a/library/ecp.c b/library/ecp.c
index 086acb3..4e28b73 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -3277,6 +3277,7 @@
                                     ECP_CURVE448_KEY_SIZE * 8 - 1, 1)
                 );
         }
+        MBEDTLS_MPI_CHK(mbedtls_ecp_check_privkey(&key->grp, &key->d));
     }
 
 #endif

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 1091c42..fa0570c 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -666,14 +666,6 @@
         return ret;
     }
 
-    /* When MBEDTLS_PK_USE_PSA_EC_DATA the key is checked while importing it
-     * into PSA. */
-#if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
-    if ((ret = mbedtls_ecp_check_privkey(&eck->grp, &eck->d)) != 0) {
-        return ret;
-    }
-#endif /* !MBEDTLS_PK_USE_PSA_EC_DATA */
-
     return 0;
 }
 #endif /* MBEDTLS_PK_HAVE_RFC8410_CURVES */
@@ -1310,12 +1302,6 @@
         }
     }
 
-#if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
-    if ((ret = mbedtls_ecp_check_privkey(&eck->grp, &eck->d)) != 0) {
-        return ret;
-    }
-#endif /* !MBEDTLS_PK_USE_PSA_EC_DATA */
-
     return 0;
 }
 #endif /* MBEDTLS_PK_HAVE_ECC_KEYS */