Merge "chore(config): correct build config MBEDTLS_ECP_MAX_OPS name" …

…into integration
TF-RMM · Mar 16, 2023 · 96bda16 · 96bda16
2 parents 5e994c4 + f725cc0
commit 96bda16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/attestation/CMakeLists.txt b/lib/attestation/CMakeLists.txt
@@ -6,19 +6,19 @@
 add_library(rmm-lib-attestation)
 
 arm_config_option(
-    NAME ECP_MAX_OPS
+    NAME MBEDTLS_ECP_MAX_OPS
     HELP "Set the number of max operations per ECC signing iteration (min: 248)"
     TYPE STRING
     DEFAULT 1000
     ADVANCED)
 
-if(ECP_MAX_OPS LESS 248)
+if(MBEDTLS_ECP_MAX_OPS LESS 248)
     message(FATAL_ERROR "ECP_MAX_OPS is less than the lowest effective
                          value for curve and MBEDTLS_ECP_WINDOW_SIZE")
 endif()
 
 target_compile_definitions(rmm-lib-attestation
-    PRIVATE "ECP_MAX_OPS=${ECP_MAX_OPS}U")
+    PRIVATE "MBEDTLS_ECP_MAX_OPS=${MBEDTLS_ECP_MAX_OPS}U")
 
 target_link_libraries(rmm-lib-attestation
   PRIVATE

diff --git a/lib/attestation/src/attestation_utils.c b/lib/attestation/src/attestation_utils.c
@@ -61,7 +61,7 @@ int attestation_init(void)
 	 *
 	 * This adjusts the length of a single signing loop.
 	 */
-	FPU_ALLOW(mbedtls_ecp_set_max_ops(ECP_MAX_OPS));
+	FPU_ALLOW(mbedtls_ecp_set_max_ops(MBEDTLS_ECP_MAX_OPS));
 
 	FPU_ALLOW(ret = attest_rnd_prng_init());
 	if (ret != 0) {