From 08091d79dd5b5799fb4959709cb1d5f21193eb63 Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Tue, 20 Aug 2024 09:56:16 +0100 Subject: [PATCH] Fix optionally safe hooks declarations Signed-off-by: Janos Follath --- tf-psa-crypto/drivers/builtin/src/bignum_core.c | 5 +++++ tf-psa-crypto/drivers/builtin/src/bignum_core.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tf-psa-crypto/drivers/builtin/src/bignum_core.c b/tf-psa-crypto/drivers/builtin/src/bignum_core.c index 69707f8f3b..3a24c85329 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum_core.c +++ b/tf-psa-crypto/drivers/builtin/src/bignum_core.c @@ -747,6 +747,11 @@ static void exp_mod_precompute_window(const mbedtls_mpi_uint *A, } } +#if defined(MBEDTLS_TEST_HOOKS) +// Set to a default that is neither MBEDTLS_MPI_IS_PUBLIC nor MBEDTLS_MPI_IS_SECRET +int mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC + MBEDTLS_MPI_IS_SECRET + 1; +#endif + /* * This function calculates the indices of the exponent where the exponentiation algorithm should * start processing. diff --git a/tf-psa-crypto/drivers/builtin/src/bignum_core.h b/tf-psa-crypto/drivers/builtin/src/bignum_core.h index eb84161279..90a2dee8c4 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum_core.h +++ b/tf-psa-crypto/drivers/builtin/src/bignum_core.h @@ -831,9 +831,9 @@ void mbedtls_mpi_core_from_mont_rep(mbedtls_mpi_uint *X, mbedtls_mpi_uint *T); #if defined(MBEDTLS_TEST_HOOKS) -int mbedtls_mpi_optionally_safe_codepath; +extern int mbedtls_mpi_optionally_safe_codepath; -static inline void mbedtls_mpi_optionally_safe_codepath_reset() +static inline void mbedtls_mpi_optionally_safe_codepath_reset(void) { // Set to a default that is neither MBEDTLS_MPI_IS_PUBLIC nor MBEDTLS_MPI_IS_SECRET mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC + MBEDTLS_MPI_IS_SECRET + 1;