commit aed832ac16a488c5e9dacfba5fa048420a2ffa6e
author Minos Galanakis <minos.galanakis@arm.com> Thu Nov 24 09:09:47 2022 +0000
committer Janos Follath <janos.follath@arm.com> Fri Nov 25 17:55:00 2022 +0000
tree 28509c3d3f3cfd3ef81cac33a3f4ad932a333756
parent a17ad48e2d139d171dfe3bb59703b41eb869b18b

bignum_mod: Adjusted input checking for `mbedtls_mpi_mod_residue_setup()`

This patch adjusts the logic of the size checking of the method,
and refactors the tests. Documentation has also been updated.

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

tests/suites/test_suite_bignum_mod.function

diff --git a/tests/suites/test_suite_bignum_mod.function b/tests/suites/test_suite_bignum_mod.function
index 5a2d000..e4d7b41 100644
--- a/tests/suites/test_suite_bignum_mod.function
+++ b/tests/suites/test_suite_bignum_mod.function
@@ -81,52 +81,32 @@
 
 /* BEGIN MERGE SLOT 7 */
 /* BEGIN_CASE */
-void mpi_residue_setup( )
+void mpi_residue_setup( char * input_X, char * input_Y, int ret )
 {
-    #define RS_ONE       0
-    #define RS_MAX_MIN1  1
-    #define RS_MAX       2
-    const char * s_data[ 3 ] = { "01", "fe", "ff" };
-
     mbedtls_mpi_uint *N = NULL;
     mbedtls_mpi_uint *R = NULL;
-    mbedtls_mpi_uint *R_MAX = NULL;
-    size_t n_limbs, r_limbs, r_max_limbs;
+    size_t n_limbs, r_limbs;
     mbedtls_mpi_mod_modulus m;
     mbedtls_mpi_mod_residue r;
 
-    /* Allocate the memory for intermediate data structures */
-    TEST_EQUAL( 0, mbedtls_test_read_mpi_core( &N, &n_limbs, s_data[ RS_MAX_MIN1 ] ) );
-    TEST_EQUAL( 0, mbedtls_test_read_mpi_core( &R, &r_limbs, s_data[ RS_ONE ] ) );
-    TEST_EQUAL( 0, mbedtls_test_read_mpi_core( &R_MAX, &r_max_limbs, s_data[ RS_MAX ] ) );
-
     mbedtls_mpi_mod_modulus_init( &m );
 
+    /* Allocate the memory for intermediate data structures */
+    TEST_EQUAL( 0, mbedtls_test_read_mpi_core( &N, &n_limbs, input_X ) );
+    TEST_EQUAL( 0, mbedtls_test_read_mpi_core( &R, &r_limbs, input_Y ) );
+
     TEST_EQUAL( 0, mbedtls_mpi_mod_modulus_setup( &m, N, n_limbs,
                 MBEDTLS_MPI_MOD_EXT_REP_LE, MBEDTLS_MPI_MOD_REP_MONTGOMERY ) );
 
-    TEST_EQUAL( 0, mbedtls_mpi_mod_residue_setup( &r, &m, R , r_limbs ) );
-
-    /* Test for r-> limbs > m-> limbs */
-    TEST_EQUAL( MBEDTLS_ERR_MPI_BAD_INPUT_DATA, mbedtls_mpi_mod_residue_setup( &r, &m, R , r_limbs + 1 ) );
-
-    /* Test for r-> p > m-> p */
-    TEST_EQUAL( MBEDTLS_ERR_MPI_BAD_INPUT_DATA, mbedtls_mpi_mod_residue_setup( &r, &m, R_MAX , r_max_limbs ) );
-
-    /* Test for r-> p == m-> p */
-    TEST_EQUAL( MBEDTLS_ERR_MPI_BAD_INPUT_DATA, mbedtls_mpi_mod_residue_setup( &r, &m, N , r_max_limbs ) );
+    TEST_EQUAL( ret, mbedtls_mpi_mod_residue_setup( &r, &m, R , r_limbs ) );
 
 exit:
     mbedtls_mpi_mod_modulus_free( &m );
     mbedtls_free( N );
     mbedtls_free( R );
-    mbedtls_free( R_MAX );
-
-    #undef RS_ONE
-    #undef RS_MAX_MIN1
-    #undef RS_MAX
 }
 /* END_CASE */
+
 /* BEGIN_CASE */
 void mpi_mod_io_neg( )
 {