Remove new bignum when not needed

New bignum modules are only needed when the new ecp_curves module is
present. Remove them when they are not needed to save code size.

Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath 2023-08-17 12:24:46 +00:00
parent a4c01dd6e9
commit f2334b7b39
6 changed files with 10 additions and 8 deletions

View file

@ -19,7 +19,7 @@
#include "common.h" #include "common.h"
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ECP_WITH_MPI_UINT)
#include <string.h> #include <string.h>
@ -403,4 +403,4 @@ cleanup:
return ret; return ret;
} }
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ECP_WITH_MPI_UINT */

View file

@ -19,7 +19,7 @@
#include "common.h" #include "common.h"
#if defined(MBEDTLS_BIGNUM_C) #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ECP_WITH_MPI_UINT)
#include <string.h> #include <string.h>
@ -285,4 +285,4 @@ void mbedtls_mpi_mod_raw_neg(mbedtls_mpi_uint *X,
(void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) borrow); (void) mbedtls_mpi_core_add_if(X, N->p, N->limbs, (unsigned) borrow);
} }
#endif /* MBEDTLS_BIGNUM_C */ #endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ECP_WITH_MPI_UINT */

View file

@ -86,6 +86,7 @@ exit:
return MBEDTLS_ERR_MPI_BAD_INPUT_DATA; return MBEDTLS_ERR_MPI_BAD_INPUT_DATA;
} }
#if defined(MBEDTLS_ECP_WITH_MPI_UINT)
int mbedtls_test_read_mpi_modulus(mbedtls_mpi_mod_modulus *N, int mbedtls_test_read_mpi_modulus(mbedtls_mpi_mod_modulus *N,
const char *s, const char *s,
mbedtls_mpi_mod_rep_selector int_rep) mbedtls_mpi_mod_rep_selector int_rep)
@ -122,6 +123,7 @@ void mbedtls_test_mpi_mod_modulus_free_with_limbs(mbedtls_mpi_mod_modulus *N)
mbedtls_free((mbedtls_mpi_uint *) N->p); mbedtls_free((mbedtls_mpi_uint *) N->p);
mbedtls_mpi_mod_modulus_free(N); mbedtls_mpi_mod_modulus_free(N);
} }
#endif /* MBEDTLS_ECP_WITH_MPI_UINT */
int mbedtls_test_read_mpi(mbedtls_mpi *X, const char *s) int mbedtls_test_read_mpi(mbedtls_mpi *X, const char *s)
{ {

View file

@ -35,7 +35,7 @@ static int test_read_residue(mbedtls_mpi_mod_residue *r,
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_BIGNUM_C * depends_on:MBEDTLS_BIGNUM_C:MBEDTLS_ECP_WITH_MPI_UINT
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */

View file

@ -11,7 +11,7 @@
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_BIGNUM_C * depends_on:MBEDTLS_BIGNUM_C:MBEDTLS_ECP_WITH_MPI_UINT
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */

View file

@ -192,7 +192,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_ECP_WITH_MPI_UINT */
void mpi_mod_random_values(int min, char *max_hex, int rep) void mpi_mod_random_values(int min, char *max_hex, int rep)
{ {
/* Same RNG as in mpi_core_random_basic */ /* Same RNG as in mpi_core_random_basic */
@ -403,7 +403,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:MBEDTLS_ECP_WITH_MPI_UINT */
void mpi_mod_random_validation(int min, char *bound_hex, void mpi_mod_random_validation(int min, char *bound_hex,
int result_limbs_delta, int result_limbs_delta,
int expected_ret) int expected_ret)