Skip to content

Commit

Permalink
Merge pull request #6575 from tom-cosgrove-arm/convert-mpi_mod_int-te…
Browse files Browse the repository at this point in the history 
…st-cases-to-hex-228

Backport 2.28: Enable mpi_mod_int test case to take full-range MPI integers
  • Loading branch information
@yanesca
yanesca authored Nov 14, 2022
2 parents 4637ed2 + 020ab7f commit 5c03ec3
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 18 deletions.
45 changes: 39 additions & 6 deletions tests/suites/test_suite_bignum.function
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1172,24 +1172,57 @@ exit:
/* END_CASE */

/* BEGIN_CASE */
void mbedtls_mpi_mod_int( char * input_X, int input_Y,
int input_A, int div_result )
void mbedtls_mpi_mod_int( char * input_X, char * input_Y,
char * input_A, int mod_result )
{
mbedtls_mpi X;
mbedtls_mpi Y;
mbedtls_mpi A;
int res;
mbedtls_mpi_uint r;

mbedtls_mpi_init( &X );
mbedtls_mpi_init( &Y );
mbedtls_mpi_init( &A );

TEST_ASSERT( mbedtls_test_read_mpi( &X, input_X ) == 0 );
res = mbedtls_mpi_mod_int( &r, &X, input_Y );
TEST_ASSERT( res == div_result );
/* We use MPIs to read Y and A since the test framework limits us to
* ints, so we can't have 64-bit values */
TEST_EQUAL( mbedtls_test_read_mpi( &X, input_X ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi( &Y, input_Y ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi( &A, input_A ), 0 );

TEST_EQUAL( Y.n, 1 );
TEST_EQUAL( A.n, 1 );

/* Convert the MPIs for Y and A to (signed) mbedtls_mpi_sints */

/* Since we're converting sign+magnitude to two's complement, we lose one
* bit of value in the output. This means there are some values we can't
* represent, e.g. (hex) -A0000000 on 32-bit systems. These are technically
* invalid test cases, so could be considered "won't happen", but they are
* easy to test for, and this helps guard against human error. */

mbedtls_mpi_sint y = (mbedtls_mpi_sint) Y.p[0];
TEST_ASSERT( y >= 0 ); /* If y < 0 here, we can't make negative y */
if( Y.s == -1 )
y = -y;

mbedtls_mpi_sint a = (mbedtls_mpi_sint) A.p[0];
TEST_ASSERT( a >= 0 ); /* Same goes for a */
if( A.s == -1 )
a = -a;

res = mbedtls_mpi_mod_int( &r, &X, y );
TEST_EQUAL( res, mod_result );
if( res == 0 )
{
TEST_ASSERT( r == (mbedtls_mpi_uint) input_A );
TEST_EQUAL( r, a );
}

exit:
mbedtls_mpi_free( &X );
mbedtls_mpi_free( &Y );
mbedtls_mpi_free( &A );
}
/* END_CASE */

Expand Down
56 changes: 44 additions & 12 deletions tests/suites/test_suite_bignum.misc.data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1202,40 +1202,72 @@ Test mbedtls_mpi_mod_mpi: 0 (null) % -1
mbedtls_mpi_mod_mpi:"":"-1":"":MBEDTLS_ERR_MPI_NEGATIVE_VALUE

Base test mbedtls_mpi_mod_int #1
mbedtls_mpi_mod_int:"3e8":13:12:0
mbedtls_mpi_mod_int:"3e8":"d":"c":0

Base test mbedtls_mpi_mod_int #2 (Divide by zero)
mbedtls_mpi_mod_int:"3e8":0:0:MBEDTLS_ERR_MPI_DIVISION_BY_ZERO
mbedtls_mpi_mod_int:"3e8":"0":"0":MBEDTLS_ERR_MPI_DIVISION_BY_ZERO

Base test mbedtls_mpi_mod_int #3
mbedtls_mpi_mod_int:"-3e8":13:1:0
mbedtls_mpi_mod_int:"-3e8":"d":"1":0

Base test mbedtls_mpi_mod_int #4 (Negative modulo)
mbedtls_mpi_mod_int:"3e8":-13:0:MBEDTLS_ERR_MPI_NEGATIVE_VALUE
mbedtls_mpi_mod_int:"3e8":"-d":"0":MBEDTLS_ERR_MPI_NEGATIVE_VALUE

Base test mbedtls_mpi_mod_int #5 (Negative modulo)
mbedtls_mpi_mod_int:"-3e8":-13:0:MBEDTLS_ERR_MPI_NEGATIVE_VALUE
mbedtls_mpi_mod_int:"-3e8":"-d":"0":MBEDTLS_ERR_MPI_NEGATIVE_VALUE

Base test mbedtls_mpi_mod_int #6 (By 1)
mbedtls_mpi_mod_int:"3e8":1:0:0
mbedtls_mpi_mod_int:"3e8":"1":"0":0

Base test mbedtls_mpi_mod_int #7 (By 2)
mbedtls_mpi_mod_int:"3e9":2:1:0
mbedtls_mpi_mod_int:"3e9":"2":"1":0

Base test mbedtls_mpi_mod_int #8 (By 2)
mbedtls_mpi_mod_int:"3e8":2:0:0
mbedtls_mpi_mod_int:"3e8":"2":"0":0

Test mbedtls_mpi_mod_int: 0 (null) % 1
mbedtls_mpi_mod_int:"":1:0:0
mbedtls_mpi_mod_int:"":"1":"0":0

Test mbedtls_mpi_mod_int: 0 (null) % 2
mbedtls_mpi_mod_int:"":2:0:0
mbedtls_mpi_mod_int:"":"2":"0":0

Test mbedtls_mpi_mod_int: 0 (null) % -1
mbedtls_mpi_mod_int:"":-1:0:MBEDTLS_ERR_MPI_NEGATIVE_VALUE
mbedtls_mpi_mod_int:"":"-1":"0":MBEDTLS_ERR_MPI_NEGATIVE_VALUE

Test mbedtls_mpi_mod_int: 0 (null) % -2
mbedtls_mpi_mod_int:"":-2:0:MBEDTLS_ERR_MPI_NEGATIVE_VALUE
mbedtls_mpi_mod_int:"":"-2":"0":MBEDTLS_ERR_MPI_NEGATIVE_VALUE

# CURRENTLY FAILS - SEE GITHUB ISSUE #6540
#Test mbedtls_mpi_mod_int: 230772460340063000000100500000300000010 % 5178236083361335880 -> 3386266129388798810
#depends_on:MBEDTLS_HAVE_INT64
#mbedtls_mpi_mod_int:"AD9D28BF6C4E98FDF156BF0980CEE30A":"47DCCA4847DCCA48":"2EFE6F1A7D28035A":0

Test mbedtls_mpi_mod_mpi: 230772460340063000000100500000300000010 % 5178236083361335880 -> 3386266129388798810
mbedtls_mpi_mod_mpi:"AD9D28BF6C4E98FDF156BF0980CEE30A":"47DCCA4847DCCA48":"2EFE6F1A7D28035A":0

# CURRENTLY FAILS - SEE GITHUB ISSUE #6540
#Test mbedtls_mpi_mod_int: 230772460340062999996714233870911201200 % 5178236083361335880 -> 0
#depends_on:MBEDTLS_HAVE_INT64
#mbedtls_mpi_mod_int:"AD9D28BF6C4E98FDC2584FEF03A6DFB0":"47DCCA4847DCCA48":"0":0

Test mbedtls_mpi_mod_mpi: 230772460340062999996714233870911201200 % 5178236083361335880 -> 0
mbedtls_mpi_mod_mpi:"AD9D28BF6C4E98FDC2584FEF03A6DFB0":"47DCCA4847DCCA48":"0":0

# CURRENTLY FAILS WHEN MPIS ARE 32-BIT (ISSUE #6450): WHEN FIXED, REMOVE "depends_on" LINE
Test mbedtls_mpi_mod_int: 230772460340063000000100500000300000010 % 1205652040 -> 3644370
depends_on:MBEDTLS_HAVE_INT64
mbedtls_mpi_mod_int:"AD9D28BF6C4E98FDF156BF0980CEE30A":"47DCCA48":"379BD2":0

Test mbedtls_mpi_mod_mpi: 230772460340063000000100500000300000010 % 1205652040 -> 3644370
mbedtls_mpi_mod_mpi:"AD9D28BF6C4E98FDF156BF0980CEE30A":"47DCCA48":"379BD2":0

# CURRENTLY FAILS WHEN MPIS ARE 32-BIT (ISSUE #6450): WHEN FIXED, REMOVE "depends_on" LINE
Test mbedtls_mpi_mod_int: 230772460340063000000100500000296355640 % 1205652040 -> 0
depends_on:MBEDTLS_HAVE_INT64
mbedtls_mpi_mod_int:"AD9D28BF6C4E98FDF156BF0980974738":"47DCCA48":"0":0

Test mbedtls_mpi_mod_mpi: 230772460340063000000100500000296355640 % 1205652040 -> 0
mbedtls_mpi_mod_mpi:"AD9D28BF6C4E98FDF156BF0980974738":"47DCCA48":"0":0

Base test mbedtls_mpi_exp_mod #1
mbedtls_mpi_exp_mod:"17":"d":"1d":"18":0
Expand Down

0 comments on commit 5c03ec3

Please sign in to comment.