commit a10d112e456bfebab8a55757d8ef1efc7d90e54d
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Jan 03 14:08:10 2024 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Jan 03 14:08:10 2024 +0100
tree ace7c0b9f4a82e35696654090af09e43a05adf58
parent 5d867872dda985052ac9304f06f7060f4f15e261

Remove useless guards on MBEDTLS_BIGNUM_C

All of ECP requires the bignum module and there is no plan to change that,
so guarding a few bits of code is just noise.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/test_suite_ecp.function

diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index c8be4e5..295fe7f 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -1123,7 +1123,6 @@
     TEST_EQUAL(key.grp.id, grp_id);
     TEST_EQUAL(mbedtls_ecp_point_cmp(&key.Q, &Q), 0);
 
-#if defined(MBEDTLS_BIGNUM_C)
     /* Key with a public key already set to a different value */
     TEST_EQUAL(mbedtls_mpi_add_int(&key.Q.X, &key.Q.X, 1), 0);
     TEST_EQUAL(mbedtls_mpi_add_int(&key.Q.Y, &key.Q.Y, 1), 0);
@@ -1131,7 +1130,6 @@
     TEST_EQUAL(mbedtls_ecp_set_public_key(grp_id, &key, &Q), 0);
     TEST_EQUAL(key.grp.id, grp_id);
     TEST_EQUAL(mbedtls_ecp_point_cmp(&key.Q, &Q), 0);
-#endif
 
 exit:
     mbedtls_ecp_keypair_free(&key);
@@ -1150,10 +1148,8 @@
     mbedtls_ecp_group_init(&grp);
     mbedtls_ecp_point Q;
     mbedtls_ecp_point_init(&Q);
-#if defined(MBEDTLS_BIGNUM_C)
     mbedtls_mpi d;
     mbedtls_mpi_init(&d);
-#endif
 
     TEST_EQUAL(mbedtls_ecp_group_load(&grp, public_grp_id), 0);
     TEST_EQUAL(mbedtls_ecp_point_read_binary(&grp, &Q,
@@ -1162,9 +1158,7 @@
     TEST_EQUAL(mbedtls_ecp_read_key(private_grp_id, &key,
                                     private_data->x, private_data->len),
                0);
-#if defined(MBEDTLS_BIGNUM_C)
     TEST_EQUAL(mbedtls_mpi_copy(&d, &key.d), 0);
-#endif
 
     int ret = mbedtls_ecp_set_public_key(public_grp_id, &key, &Q);
 
@@ -1172,9 +1166,7 @@
         TEST_EQUAL(ret, 0);
         TEST_EQUAL(key.grp.id, public_grp_id);
         TEST_EQUAL(mbedtls_ecp_point_cmp(&key.Q, &Q), 0);
-#if defined(MBEDTLS_BIGNUM_C)
         TEST_EQUAL(mbedtls_mpi_cmp_mpi(&d, &key.d), 0);
-#endif
     } else {
         TEST_EQUAL(ret, MBEDTLS_ERR_ECP_BAD_INPUT_DATA);
     }
@@ -1183,9 +1175,7 @@
     mbedtls_ecp_keypair_free(&key);
     mbedtls_ecp_group_free(&grp);
     mbedtls_ecp_point_free(&Q);
-#if defined(MBEDTLS_BIGNUM_C)
     mbedtls_mpi_free(&d);
-#endif
 }
 /* END_CASE */
 
@@ -1198,11 +1188,9 @@
     mbedtls_ecp_keypair key2;
     mbedtls_ecp_keypair_init(&key2);
 
-#if defined(MBEDTLS_BIGNUM_C)
     TEST_EQUAL(mbedtls_mpi_lset(&key.Q.X, 1), 0);
     TEST_EQUAL(mbedtls_mpi_lset(&key.Q.Y, 2), 0);
     TEST_EQUAL(mbedtls_mpi_lset(&key.Q.Z, 3), 0);
-#endif
 
     ret = mbedtls_ecp_read_key(grp_id, &key, in_key->x, in_key->len);
     TEST_ASSERT(ret == expected);
@@ -1212,11 +1200,9 @@
         ret = mbedtls_ecp_check_privkey(&key.grp, &key.d);
         TEST_ASSERT(ret == 0);
 
-#if defined(MBEDTLS_BIGNUM_C)
         TEST_EQUAL(mbedtls_mpi_cmp_int(&key.Q.X, 1), 0);
         TEST_EQUAL(mbedtls_mpi_cmp_int(&key.Q.Y, 2), 0);
         TEST_EQUAL(mbedtls_mpi_cmp_int(&key.Q.Z, 3), 0);
-#endif
 
         if (canonical) {
             unsigned char buf[MBEDTLS_ECP_MAX_BYTES];