commit 0b304421d8ebd57b8c1a6ae06fb9e5b6b0a23e8b
author Valerio Setti <valerio.setti@nordicsemi.no> Tue Apr 04 11:10:18 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Tue Apr 11 09:16:24 2023 +0200
tree 028714b679ff8874c1c0beb77078b647082f742c
parent 37194b97f8d61de5d10c24f00613c4260e8dd854

ecp: revert changes to ECP module and related tests/programs

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

include/mbedtls/ecp.h

diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h
index d09b5f5..b6144d9 100644
--- a/include/mbedtls/ecp.h
+++ b/include/mbedtls/ecp.h
@@ -1214,7 +1214,6 @@
  * \return          An \c MBEDTLS_ERR_ECP_XXX or \c MBEDTLS_MPI_XXX error code
  *                  on failure.
  */
-#if !defined(MBEDTLS_USE_PSA_CRYPTO)
 int mbedtls_ecp_gen_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d,
                             mbedtls_ecp_point *Q,
                             int (*f_rng)(void *, unsigned char *, size_t),
@@ -1236,7 +1235,6 @@
 int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
                         int (*f_rng)(void *, unsigned char *, size_t),
                         void *p_rng);
-#endif /* !MBEDTLS_USE_PSA_CRYPTO */
 
 /**
  * \brief           This function reads an elliptic curve private key.

library/ecp.c

diff --git a/library/ecp.c b/library/ecp.c
index 50058af..08fbe86 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -3159,7 +3159,6 @@
     return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 }
 
-#if !defined(MBEDTLS_USE_PSA_CRYPTO)
 /*
  * Generate a keypair with configurable base point
  */
@@ -3201,7 +3200,6 @@
 
     return mbedtls_ecp_gen_keypair(&key->grp, &key->d, &key->Q, f_rng, p_rng);
 }
-#endif /* !MBEDTLS_USE_PSA_CRYPTO */
 
 #define ECP_CURVE25519_KEY_SIZE 32
 #define ECP_CURVE448_KEY_SIZE   56

programs/pkey/gen_key.c

diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c
index 57b7d40..029558d 100644
--- a/programs/pkey/gen_key.c
+++ b/programs/pkey/gen_key.c
@@ -321,7 +321,7 @@
         }
     } else
 #endif /* MBEDTLS_RSA_C */
-#if defined(MBEDTLS_ECP_C) && !defined(MBEDTLS_USE_PSA_CRYPTO)
+#if defined(MBEDTLS_ECP_C)
     if (opt.type == MBEDTLS_PK_ECKEY) {
         ret = mbedtls_ecp_gen_key((mbedtls_ecp_group_id) opt.ec_curve,
                                   mbedtls_pk_ec(key),

tests/suites/test_suite_ecp.function

diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 4a9bc53..4b51a9f 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -987,7 +987,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:!MBEDTLS_USE_PSA_CRYPTO */
+/* BEGIN_CASE */
 void mbedtls_ecp_gen_keypair(int id)
 {
     mbedtls_ecp_group grp;
@@ -1016,7 +1016,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:!MBEDTLS_USE_PSA_CRYPTO */
+/* BEGIN_CASE */
 void mbedtls_ecp_gen_key(int id)
 {
     mbedtls_ecp_keypair key;