From 4f43f61c6ad965a8a9cae7afc5af875c959b33b6 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Thu, 20 Oct 2022 09:46:59 +0100 Subject: [PATCH] Renamed mbedtls_mpi_get_montgomery_constant_unsafe to mpi_core_get_mont_R2_unsafe Signed-off-by: Minos Galanakis --- library/bignum_core.c | 4 +-- library/bignum_core.h | 4 +-- tests/suites/test_suite_bignum.function | 18 +++++----- tests/suites/test_suite_bignum.misc.data | 44 ++++++++++++------------ 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/library/bignum_core.c b/library/bignum_core.c index 457405d27..a3547bd64 100644 --- a/library/bignum_core.c +++ b/library/bignum_core.c @@ -511,8 +511,8 @@ void mbedtls_mpi_core_montmul( mbedtls_mpi_uint *X, mbedtls_ct_mpi_uint_cond_assign( AN_limbs, X, T, (unsigned char) ( carry ^ borrow ) ); } -int mbedtls_mpi_get_montgomery_constant_unsafe( mbedtls_mpi *X, - mbedtls_mpi const *N ) +int mbedtls_mpi_core_get_mont_R2_unsafe( mbedtls_mpi *X, + mbedtls_mpi const *N ) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; diff --git a/library/bignum_core.h b/library/bignum_core.h index 3100bd5ff..57f27ddf2 100644 --- a/library/bignum_core.h +++ b/library/bignum_core.h @@ -428,7 +428,7 @@ void mbedtls_mpi_core_montmul( mbedtls_mpi_uint *X, * \return #MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED \p N, \p X are NULL * or other operations fail. */ -int mbedtls_mpi_get_montgomery_constant_unsafe( mbedtls_mpi *X, - mbedtls_mpi const *N ); +int mbedtls_mpi_core_get_mont_R2_unsafe( mbedtls_mpi *X, + mbedtls_mpi const *N ); #endif /* MBEDTLS_BIGNUM_CORE_H */ diff --git a/tests/suites/test_suite_bignum.function b/tests/suites/test_suite_bignum.function index e94681a28..4b5aee577 100644 --- a/tests/suites/test_suite_bignum.function +++ b/tests/suites/test_suite_bignum.function @@ -1417,7 +1417,7 @@ exit: /* END_CASE */ /* BEGIN_CASE */ -void mpi_get_montgomery_constant_unsafe_neg( ) +void mpi_core_get_mont_R2_unsafe_neg( ) { mbedtls_mpi N, RR; mbedtls_mpi_init( &N ); @@ -1426,20 +1426,20 @@ void mpi_get_montgomery_constant_unsafe_neg( ) /* Test for NULL input pointers */ TEST_EQUAL( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED, - mbedtls_mpi_get_montgomery_constant_unsafe( NULL, &N ) ); + mbedtls_mpi_core_get_mont_R2_unsafe( NULL, &N ) ); TEST_EQUAL( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED, - mbedtls_mpi_get_montgomery_constant_unsafe( &RR, NULL ) ); + mbedtls_mpi_core_get_mont_R2_unsafe( &RR, NULL ) ); /* Test for zero divisor */ TEST_EQUAL( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO, - mbedtls_mpi_get_montgomery_constant_unsafe( &RR, &N ) ); + mbedtls_mpi_core_get_mont_R2_unsafe( &RR, &N ) ); /* Test for negative input */ TEST_EQUAL( 0, mbedtls_test_read_mpi( &N, n ) ); N.s = -1; TEST_EQUAL( MBEDTLS_ERR_MPI_NEGATIVE_VALUE, - mbedtls_mpi_get_montgomery_constant_unsafe( &RR, &N ) ); + mbedtls_mpi_core_get_mont_R2_unsafe( &RR, &N ) ); N.s = 1; exit: @@ -1449,9 +1449,9 @@ exit: /* END_CASE */ /* BEGIN_CASE */ -void mpi_get_montgomery_constant_unsafe( char * input_N, - char * input_RR_X4, - char * input_RR_X8 ) +void mpi_core_get_mont_R2_unsafe( char * input_N, + char * input_RR_X4, + char * input_RR_X8 ) { mbedtls_mpi N, RR, RR_REF; @@ -1471,7 +1471,7 @@ void mpi_get_montgomery_constant_unsafe( char * input_N, TEST_EQUAL( 1, sign_is_valid(&RR_REF)); /* Test valid input */ - TEST_EQUAL( 0, mbedtls_mpi_get_montgomery_constant_unsafe( &RR, &N ) ); + TEST_EQUAL( 0, mbedtls_mpi_core_get_mont_R2_unsafe( &RR, &N ) ); /* Test that the moduli is odd */ TEST_EQUAL(N.p[0] ^ 1, N.p[0] - 1); diff --git a/tests/suites/test_suite_bignum.misc.data b/tests/suites/test_suite_bignum.misc.data index b93b18391..0c9e91785 100644 --- a/tests/suites/test_suite_bignum.misc.data +++ b/tests/suites/test_suite_bignum.misc.data @@ -1902,38 +1902,38 @@ mpi_random_fail:2:"01":MBEDTLS_ERR_MPI_BAD_INPUT_DATA MPI random bad arguments: min > N = 1, 0 limb in upper bound mpi_random_fail:2:"000000000000000001":MBEDTLS_ERR_MPI_BAD_INPUT_DATA -mbedtls_mpi_get_montgomery_constant_unsafe_neg -mpi_get_montgomery_constant_unsafe_neg: +mbedtls_mpi_core_get_mont_R2_unsafe_neg +mpi_core_get_mont_R2_unsafe_neg: -mbedtls_mpi_get_montgomery_constant_unsafe #1 -mpi_get_montgomery_constant_unsafe:"f":"1":"1" +mbedtls_mpi_core_get_mont_R2_unsafe #1 +mpi_core_get_mont_R2_unsafe:"f":"1":"1" -mbedtls_mpi_get_montgomery_constant_unsafe #2 -mpi_get_montgomery_constant_unsafe:"fd":"ec":"24" +mbedtls_mpi_core_get_mont_R2_unsafe #2 +mpi_core_get_mont_R2_unsafe:"fd":"ec":"24" -mbedtls_mpi_get_montgomery_constant_unsafe #3 -mpi_get_montgomery_constant_unsafe:"eeff99aa37":"a23bd6a686":"a23bd6a686" +mbedtls_mpi_core_get_mont_R2_unsafe #3 +mpi_core_get_mont_R2_unsafe:"eeff99aa37":"a23bd6a686":"a23bd6a686" -mbedtls_mpi_get_montgomery_constant_unsafe #4 -mpi_get_montgomery_constant_unsafe:"eeff99aa11":"3308cb71":"3308cb71" +mbedtls_mpi_core_get_mont_R2_unsafe #4 +mpi_core_get_mont_R2_unsafe:"eeff99aa11":"3308cb71":"3308cb71" -mbedtls_mpi_get_montgomery_constant_unsafe #5 -mpi_get_montgomery_constant_unsafe:"800000000005":"6400000000":"6400000000" +mbedtls_mpi_core_get_mont_R2_unsafe #5 +mpi_core_get_mont_R2_unsafe:"800000000005":"6400000000":"6400000000" -mbedtls_mpi_get_montgomery_constant_unsafe #6 -mpi_get_montgomery_constant_unsafe:"7fffffffffffffff":"4":"4" +mbedtls_mpi_core_get_mont_R2_unsafe #6 +mpi_core_get_mont_R2_unsafe:"7fffffffffffffff":"4":"4" -mbedtls_mpi_get_montgomery_constant_unsafe #7 -mpi_get_montgomery_constant_unsafe:"80fe000a10000001":"5dbc6e833bad575a":"5dbc6e833bad575a" +mbedtls_mpi_core_get_mont_R2_unsafe #7 +mpi_core_get_mont_R2_unsafe:"80fe000a10000001":"5dbc6e833bad575a":"5dbc6e833bad575a" -mbedtls_mpi_get_montgomery_constant_unsafe #8 -mpi_get_montgomery_constant_unsafe:"25a55a46e5da99c71c7":"11637ce1347edeaf669":"1e455bf7451c05bc711" +mbedtls_mpi_core_get_mont_R2_unsafe #8 +mpi_core_get_mont_R2_unsafe:"25a55a46e5da99c71c7":"11637ce1347edeaf669":"1e455bf7451c05bc711" -mbedtls_mpi_get_montgomery_constant_unsafe #9 -mpi_get_montgomery_constant_unsafe:"314dc643fb763f2b8c0e2de00879":"1058ad82120c3a10196bb36229c1":"1058ad82120c3a10196bb36229c1" +mbedtls_mpi_core_get_mont_R2_unsafe #9 +mpi_core_get_mont_R2_unsafe:"314dc643fb763f2b8c0e2de00879":"1058ad82120c3a10196bb36229c1":"1058ad82120c3a10196bb36229c1" -mbedtls_mpi_get_montgomery_constant_unsafe #10 -mpi_get_montgomery_constant_unsafe:"8335616aed761f1f7f44e6bd49e807b82e3bf2bf11bfa6af813c808dbf33dbfa11dabd6e6144bef37c6800000000000000000000000000000000051":"78a9f16233856e722242e964006ed8666bfe8e55ea736ea86ce7aa71511e36d9ea1509ad5d821f7777e4a2d885924d15cc11e2ccd85eba69ab04989":"5c9d20a5636b6d7abdec003c1ad87e7c88ebf7238a5d85800d3bc214512cd6269558728307ae94eb389e2ccd85eba69ab0493e8277211ce1be22db" +mbedtls_mpi_core_get_mont_R2_unsafe #10 +mpi_core_get_mont_R2_unsafe:"8335616aed761f1f7f44e6bd49e807b82e3bf2bf11bfa6af813c808dbf33dbfa11dabd6e6144bef37c6800000000000000000000000000000000051":"78a9f16233856e722242e964006ed8666bfe8e55ea736ea86ce7aa71511e36d9ea1509ad5d821f7777e4a2d885924d15cc11e2ccd85eba69ab04989":"5c9d20a5636b6d7abdec003c1ad87e7c88ebf7238a5d85800d3bc214512cd6269558728307ae94eb389e2ccd85eba69ab0493e8277211ce1be22db" MPI Selftest depends_on:MBEDTLS_SELF_TEST