lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Fix representation of mod-random output

Browse Source 
mbedtls_mpi_mod_raw_random() and mbedtls_mpi_mod_random() were producing
output in the Montgomery representation, instead of obeying the
representation chosen in the modulus structure. Fix this.

Duplicate the test cases for mod-random output to have separate test cases
for each representation.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2022-12-20 19:31:09 +01:00
parent be69c7d559
commit e1d8326e90
3 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/bignum_mod_raw.c
View File

@ -215,7 +215,7 @@ int mbedtls_mpi_mod_raw_random( mbedtls_mpi_uint *X,
int ret = mbedtls_mpi_core_random( X, min, N->p, N->limbs, f_rng, p_rng ); int ret = mbedtls_mpi_core_random( X, min, N->p, N->limbs, f_rng, p_rng );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
return( mbedtls_mpi_mod_raw_to_mont_rep( X, N ) ); return( mbedtls_mpi_mod_raw_canonical_to_modulus_rep( X, N ) );
} }
/* END MERGE SLOT 6 */ /* END MERGE SLOT 6 */

70
tests/suites/test_suite_bignum_random.data
View File

@ -25,8 +25,11 @@ mpi_core_random_basic:0x0fffffff:"10000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
MPI random legacy=core: 2^28-1..2^28+1 (NOT_ACCEPTABLE) MPI random legacy=core: 2^28-1..2^28+1 (NOT_ACCEPTABLE)
mpi_legacy_random_values:0x0fffffff:"10000001" mpi_legacy_random_values:0x0fffffff:"10000001"
MPI random mod=core: 2^28-1..2^28+1 (NOT_ACCEPTABLE) MPI random mod=core: 2^28-1..2^28+1 (NOT_ACCEPTABLE) (Mont)
mpi_mod_random_values:0x0fffffff:"10000001" mpi_mod_random_values:0x0fffffff:"10000001":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^28-1..2^28+1 (NOT_ACCEPTABLE) (canon)
mpi_mod_random_values:0x0fffffff:"10000001":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI core random basic: 2^29-1..2^29+1 (NOT_ACCEPTABLE) MPI core random basic: 2^29-1..2^29+1 (NOT_ACCEPTABLE)
mpi_core_random_basic:0x1fffffff:"20000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE mpi_core_random_basic:0x1fffffff:"20000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
@ -34,8 +37,11 @@ mpi_core_random_basic:0x1fffffff:"20000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
MPI random legacy=core: 2^29-1..2^29+1 (NOT_ACCEPTABLE) MPI random legacy=core: 2^29-1..2^29+1 (NOT_ACCEPTABLE)
mpi_legacy_random_values:0x1fffffff:"20000001" mpi_legacy_random_values:0x1fffffff:"20000001"
MPI random mod=core: 2^29-1..2^29+1 (NOT_ACCEPTABLE) MPI random mod=core: 2^29-1..2^29+1 (NOT_ACCEPTABLE) (Mont)
mpi_mod_random_values:0x1fffffff:"20000001" mpi_mod_random_values:0x1fffffff:"20000001":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^29-1..2^29+1 (NOT_ACCEPTABLE) (canon)
mpi_mod_random_values:0x1fffffff:"20000001":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI core random basic: 2^30-1..2^30+1 (NOT_ACCEPTABLE) MPI core random basic: 2^30-1..2^30+1 (NOT_ACCEPTABLE)
mpi_core_random_basic:0x3fffffff:"40000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE mpi_core_random_basic:0x3fffffff:"40000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
@ -43,8 +49,11 @@ mpi_core_random_basic:0x3fffffff:"40000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
MPI random legacy=core: 2^30-1..2^30+1 (NOT_ACCEPTABLE) MPI random legacy=core: 2^30-1..2^30+1 (NOT_ACCEPTABLE)
mpi_legacy_random_values:0x3fffffff:"40000001" mpi_legacy_random_values:0x3fffffff:"40000001"
MPI random mod=core: 2^30-1..2^30+1 (NOT_ACCEPTABLE) MPI random mod=core: 2^30-1..2^30+1 (NOT_ACCEPTABLE) (Mont)
mpi_mod_random_values:0x3fffffff:"40000001" mpi_mod_random_values:0x3fffffff:"40000001":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^30-1..2^30+1 (NOT_ACCEPTABLE) (canon)
mpi_mod_random_values:0x3fffffff:"40000001":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI core random basic: 2^31-1..2^31+1 (NOT_ACCEPTABLE) MPI core random basic: 2^31-1..2^31+1 (NOT_ACCEPTABLE)
mpi_core_random_basic:0x7fffffff:"80000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE mpi_core_random_basic:0x7fffffff:"80000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
@ -52,8 +61,11 @@ mpi_core_random_basic:0x7fffffff:"80000001":MBEDTLS_ERR_MPI_NOT_ACCEPTABLE
MPI random legacy=core: 2^31-1..2^31+1 (NOT_ACCEPTABLE) MPI random legacy=core: 2^31-1..2^31+1 (NOT_ACCEPTABLE)
mpi_legacy_random_values:0x7fffffff:"80000001" mpi_legacy_random_values:0x7fffffff:"80000001"
MPI random mod=core: 2^31-1..2^31+1 (NOT_ACCEPTABLE) MPI random mod=core: 2^31-1..2^31+1 (NOT_ACCEPTABLE) (Mont)
mpi_mod_random_values:0x7fffffff:"80000001" mpi_mod_random_values:0x7fffffff:"80000001":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^31-1..2^31+1 (NOT_ACCEPTABLE) (canon)
mpi_mod_random_values:0x7fffffff:"80000001":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random in range: 1..2 MPI random in range: 1..2
mpi_random_many:1:"02":1000 mpi_random_many:1:"02":1000
@ -246,23 +258,41 @@ mpi_legacy_random_values:0:"0100000000000000000000000000000000000000000000000000
MPI random legacy=core: 0..2^256+1 MPI random legacy=core: 0..2^256+1
mpi_legacy_random_values:0:"010000000000000000000000000000000000000000000000000000000000000001" mpi_legacy_random_values:0:"010000000000000000000000000000000000000000000000000000000000000001"
MPI random mod=core: 0..1 MPI random mod=core: 0..1 (Mont)
mpi_mod_random_values:0:"01" mpi_mod_random_values:0:"01":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 0..3 MPI random mod=core: 0..1 (canon)
mpi_mod_random_values:0:"03" mpi_mod_random_values:0:"01":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod=core: 1..3 MPI random mod=core: 0..3 (Mont)
mpi_mod_random_values:1:"03" mpi_mod_random_values:0:"03":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^30..2^31-1 MPI random mod=core: 0..3 (canon)
mpi_mod_random_values:0x40000000:"7fffffff" mpi_mod_random_values:0:"03":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod=core: 2^31-1..2^32-1 MPI random mod=core: 1..3 (Mont)
mpi_mod_random_values:0x7fffffff:"ffffffff" mpi_mod_random_values:1:"03":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 0..2^256+1 MPI random mod=core: 1..3 (canon)
mpi_mod_random_values:0:"010000000000000000000000000000000000000000000000000000000000000001" mpi_mod_random_values:1:"03":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod=core: 2^30..2^31-1 (Mont)
mpi_mod_random_values:0x40000000:"7fffffff":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^30..2^31-1 (canon)
mpi_mod_random_values:0x40000000:"7fffffff":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod=core: 2^31-1..2^32-1 (Mont)
mpi_mod_random_values:0x7fffffff:"ffffffff":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 2^31-1..2^32-1 (canon)
mpi_mod_random_values:0x7fffffff:"ffffffff":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod=core: 0..2^256+1 (Mont)
mpi_mod_random_values:0:"010000000000000000000000000000000000000000000000000000000000000001":MBEDTLS_MPI_MOD_REP_MONTGOMERY
MPI random mod=core: 0..2^256+1 (canon)
mpi_mod_random_values:0:"010000000000000000000000000000000000000000000000000000000000000001":MBEDTLS_MPI_MOD_REP_OPT_RED
MPI random mod validation: 1 limb, good, 0..1 MPI random mod validation: 1 limb, good, 0..1
mpi_mod_random_validation:0:"1":0:0 mpi_mod_random_validation:0:"1":0:0

16
tests/suites/test_suite_bignum_random.function
View File

@ -192,7 +192,7 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_random_values( int min, char *max_hex ) void mpi_mod_random_values( int min, char *max_hex, int rep )
{ {
/* Same RNG as in mpi_core_random_basic */ /* Same RNG as in mpi_core_random_basic */
mbedtls_test_rnd_pseudo_info rnd_core = { mbedtls_test_rnd_pseudo_info rnd_core = {
@ -210,9 +210,7 @@ void mpi_mod_random_values( int min, char *max_hex )
mbedtls_mpi_mod_modulus N; mbedtls_mpi_mod_modulus N;
mbedtls_mpi_mod_modulus_init( &N ); mbedtls_mpi_mod_modulus_init( &N );
TEST_EQUAL( mbedtls_test_read_mpi_modulus( &N, max_hex, TEST_EQUAL( mbedtls_test_read_mpi_modulus( &N, max_hex, rep ), 0 );
MBEDTLS_MPI_MOD_REP_MONTGOMERY ),
0 );
ASSERT_ALLOC( R_core, N.limbs ); ASSERT_ALLOC( R_core, N.limbs );
ASSERT_ALLOC( R_mod_raw, N.limbs ); ASSERT_ALLOC( R_mod_raw, N.limbs );
ASSERT_ALLOC( R_mod_digits, N.limbs ); ASSERT_ALLOC( R_mod_digits, N.limbs );
@ -240,10 +238,12 @@ void mpi_mod_random_values( int min, char *max_hex )
TEST_EQUAL( core_ret, mod_ret ); TEST_EQUAL( core_ret, mod_ret );
if( core_ret == 0 ) if( core_ret == 0 )
{ {
TEST_EQUAL( mbedtls_mpi_mod_raw_from_mont_rep( R_mod_raw, &N ), 0 ); TEST_EQUAL( mbedtls_mpi_mod_raw_modulus_to_canonical_rep( R_mod_raw, &N ),
0 );
ASSERT_COMPARE( R_core, N.limbs * ciL, ASSERT_COMPARE( R_core, N.limbs * ciL,
R_mod_raw, N.limbs * ciL ); R_mod_raw, N.limbs * ciL );
TEST_EQUAL( mbedtls_mpi_mod_raw_from_mont_rep( R_mod_digits, &N ), 0 ); TEST_EQUAL( mbedtls_mpi_mod_raw_modulus_to_canonical_rep( R_mod_digits, &N ),
0 );
ASSERT_COMPARE( R_core, N.limbs * ciL, ASSERT_COMPARE( R_core, N.limbs * ciL,
R_mod_digits, N.limbs * ciL ); R_mod_digits, N.limbs * ciL );
} }
@ -428,7 +428,7 @@ void mpi_mod_random_validation( int min, char *bound_hex,
mbedtls_mpi_mod_modulus_init( &N ); mbedtls_mpi_mod_modulus_init( &N );
TEST_EQUAL( mbedtls_test_read_mpi_modulus( &N, bound_hex, TEST_EQUAL( mbedtls_test_read_mpi_modulus( &N, bound_hex,
MBEDTLS_MPI_MOD_REP_MONTGOMERY ), MBEDTLS_MPI_MOD_REP_OPT_RED ),
0 ); 0 );
size_t result_limbs = N.limbs + result_limbs_delta; size_t result_limbs = N.limbs + result_limbs_delta;
ASSERT_ALLOC( result_digits, result_limbs ); ASSERT_ALLOC( result_digits, result_limbs );
@ -445,7 +445,6 @@ void mpi_mod_random_validation( int min, char *bound_hex,
* size as the modulus, otherwise it's a mistake in the test data. */ * size as the modulus, otherwise it's a mistake in the test data. */
TEST_EQUAL( result_limbs, N.limbs ); TEST_EQUAL( result_limbs, N.limbs );
/* Sanity check: check that the result is in range */ /* Sanity check: check that the result is in range */
TEST_EQUAL( mbedtls_mpi_mod_raw_from_mont_rep( result_digits, &N ), 0 );
TEST_EQUAL( mbedtls_mpi_core_lt_ct( result_digits, N.p, N.limbs ), TEST_EQUAL( mbedtls_mpi_core_lt_ct( result_digits, N.p, N.limbs ),
1 ); 1 );
/* Check result >= min (changes result) */ /* Check result >= min (changes result) */
@ -463,7 +462,6 @@ void mpi_mod_random_validation( int min, char *bound_hex,
expected_ret ); expected_ret );
if( expected_ret == 0 ) if( expected_ret == 0 )
{ {
TEST_EQUAL( mbedtls_mpi_mod_raw_from_mont_rep( result_digits, &N ), 0 );
TEST_EQUAL( mbedtls_mpi_core_lt_ct( result_digits, N.p, N.limbs ), TEST_EQUAL( mbedtls_mpi_core_lt_ct( result_digits, N.p, N.limbs ),
1 ); 1 );
TEST_EQUAL( mbedtls_mpi_core_sub_int( result_digits, result.p, min, TEST_EQUAL( mbedtls_mpi_core_sub_int( result_digits, result.p, min,