From 0b304421d8ebd57b8c1a6ae06fb9e5b6b0a23e8b Mon Sep 17 00:00:00 2001
From: Valerio Setti <valerio.setti@nordicsemi.no>
Date: Tue, 4 Apr 2023 11:10:18 +0200
Subject: [PATCH] ecp: revert changes to ECP module and related tests/programs

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
---
 include/mbedtls/ecp.h                | 2 --
 library/ecp.c                        | 2 --
 programs/pkey/gen_key.c              | 2 +-
 tests/suites/test_suite_ecp.function | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h
index d09b5f527f..b6144d9aeb 100644
--- a/include/mbedtls/ecp.h
+++ b/include/mbedtls/ecp.h
@@ -1214,7 +1214,6 @@ int mbedtls_ecp_gen_keypair_base(mbedtls_ecp_group *grp,
  * \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_keypair(mbedtls_ecp_group *grp, mbedtls_mpi *d,
 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.
diff --git a/library/ecp.c b/library/ecp.c
index 50058af6ef..08fbe86c73 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -3159,7 +3159,6 @@ int mbedtls_ecp_gen_privkey(const mbedtls_ecp_group *grp,
     return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
 }
 
-#if !defined(MBEDTLS_USE_PSA_CRYPTO)
 /*
  * Generate a keypair with configurable base point
  */
@@ -3201,7 +3200,6 @@ int mbedtls_ecp_gen_key(mbedtls_ecp_group_id grp_id, mbedtls_ecp_keypair *key,
 
     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
diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c
index 57b7d40009..029558d817 100644
--- a/programs/pkey/gen_key.c
+++ b/programs/pkey/gen_key.c
@@ -321,7 +321,7 @@ usage:
         }
     } 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),
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index 4a9bc53519..4b51a9fb9d 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -987,7 +987,7 @@ exit:
 }
 /* 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 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:!MBEDTLS_USE_PSA_CRYPTO */
+/* BEGIN_CASE */
 void mbedtls_ecp_gen_key(int id)
 {
     mbedtls_ecp_keypair key;