From 9d80879f90d7e3e2e7df0de05cae090dbf2f72ad Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Thu, 13 Apr 2023 12:22:41 +0100 Subject: [PATCH] ecp_curves: Introduced `mbedtls_ecp_mod_p224k1()` This patch introduces a `MBEDTLS_STATIC_TESTABLE` helper method which exposes `ecp_mod_p256k1()` to the test-framework Signed-off-by: Minos Galanakis --- library/ecp_curves.c | 11 +++++++++-- library/ecp_invasive.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/library/ecp_curves.c b/library/ecp_curves.c index 4ebe5de2b2..1376f5d8f2 100644 --- a/library/ecp_curves.c +++ b/library/ecp_curves.c @@ -4612,8 +4612,9 @@ MBEDTLS_STATIC_TESTABLE int mbedtls_ecp_mod_p192k1(mbedtls_mpi *); #endif #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) +static int ecp_mod_p224k1(mbedtls_mpi *); MBEDTLS_STATIC_TESTABLE -int ecp_mod_p224k1(mbedtls_mpi *); +int mbedtls_ecp_mod_p224k1(mbedtls_mpi *); #endif #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED) static int ecp_mod_p256k1(mbedtls_mpi *); @@ -5625,12 +5626,18 @@ int mbedtls_ecp_mod_p192k1(mbedtls_mpi *N) #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */ #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) + +static int ecp_mod_p224k1(mbedtls_mpi *N) +{ + return mbedtls_ecp_mod_p224k1(N); +} + /* * Fast quasi-reduction modulo p224k1 = 2^224 - R, * with R = 2^32 + 2^12 + 2^11 + 2^9 + 2^7 + 2^4 + 2 + 1 = 0x0100001A93 */ MBEDTLS_STATIC_TESTABLE -int ecp_mod_p224k1(mbedtls_mpi *N) +int mbedtls_ecp_mod_p224k1(mbedtls_mpi *N) { static mbedtls_mpi_uint Rp[] = { MBEDTLS_BYTES_TO_T_UINT_8(0x93, 0x1A, 0x00, 0x00, 0x01, 0x00, 0x00, diff --git a/library/ecp_invasive.h b/library/ecp_invasive.h index ae8598dc93..b7cd6e2070 100644 --- a/library/ecp_invasive.h +++ b/library/ecp_invasive.h @@ -182,7 +182,7 @@ int mbedtls_ecp_mod_p192k1(mbedtls_mpi *N); #if defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED) MBEDTLS_STATIC_TESTABLE -int ecp_mod_p224k1(mbedtls_mpi *N); +int mbedtls_ecp_mod_p224k1(mbedtls_mpi *N); #endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */