commit e9fa7a74cd6fb62bbc241576f35abdd67f19507b
author Minos Galanakis <minos.galanakis@arm.com> Wed Jan 18 09:46:52 2023 +0000
committer Minos Galanakis <minos.galanakis@arm.com> Thu Jan 19 16:12:07 2023 +0000
tree 929e0ee5b244d99550b51361c7e8fc251fd4a910
parent d61dbd4df7deace80bd3e315f6547ba3f925c5c4

ecp_curves: Update pre-processor define guards for `ecp_mpi_load()`.

This patch adjusts the logic, so that the method is included,
when the following components are enabled:

* MBEDTLS_ECP_DP_CURVE448_ENABLED
* MBEDTLS_ECP_DP_CURVE25519_ENABLED
* ECP_LOAD_GROUP

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

library/ecp_curves.c

diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 88c4c85..727283f 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -4502,7 +4502,9 @@
 #endif
 #endif /* MBEDTLS_ECP_DP_BP512R1_ENABLED */
 
-#if defined(ECP_LOAD_GROUP)
+
+#if defined(ECP_LOAD_GROUP) || defined(MBEDTLS_ECP_DP_CURVE25519_ENABLED) || \
+    defined(MBEDTLS_ECP_DP_CURVE448_ENABLED)
 /*
  * Create an MPI from embedded constants
  * (assumes len is an exact multiple of sizeof mbedtls_mpi_uint)
@@ -4513,7 +4515,9 @@
     X->n = len / sizeof(mbedtls_mpi_uint);
     X->p = (mbedtls_mpi_uint *) p;
 }
+#endif
 
+#if defined(ECP_LOAD_GROUP)
 /*
  * Set an MPI to static value 1
  */