mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 00:40:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update tests to use mbedtls_test_read_mpi_core

Browse Source 
In conditional assign and swap tests use the mbedtls_test_read_mpi_core
function for reading MPIs.

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2022-10-19 17:22:15 +02:00
parent 49e9fbd6bc
commit 7ba7b3aded
No known key found for this signature in database
GPG Key ID: F072ACA227ACD71D
2 changed files with 39 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tests/suites/test_suite_bignum_core.function
View File

@ -345,14 +345,18 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_core_cond_assign( data_t * input_X, void mpi_core_cond_assign( char * input_X,
data_t * input_Y, char * input_Y,
int input_bytes ) int input_bytes )
{ {
mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *X = NULL;
mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *Y = NULL;
size_t limbs_X = CHARS_TO_LIMBS( input_X->len ); size_t limbs_X;
size_t limbs_Y = CHARS_TO_LIMBS( input_Y->len ); size_t limbs_Y;
TEST_EQUAL( mbedtls_test_read_mpi_core( &X, &limbs_X, input_X ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi_core( &Y, &limbs_Y, input_Y ), 0 );
size_t limbs = limbs_X; size_t limbs = limbs_X;
size_t copy_limbs = CHARS_TO_LIMBS( input_bytes ); size_t copy_limbs = CHARS_TO_LIMBS( input_bytes );
size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t bytes = limbs * sizeof( mbedtls_mpi_uint );
@ -361,24 +365,12 @@ void mpi_core_cond_assign( data_t * input_X,
TEST_EQUAL( limbs_X, limbs_Y ); TEST_EQUAL( limbs_X, limbs_Y );
TEST_ASSERT( copy_limbs <= limbs ); TEST_ASSERT( copy_limbs <= limbs );
ASSERT_ALLOC( X, limbs );
ASSERT_ALLOC( Y, limbs );
TEST_ASSERT( mbedtls_mpi_core_read_be( X, limbs, input_X->x, input_X->len )
== 0 );
TEST_ASSERT( mbedtls_mpi_core_read_be( Y, limbs, input_Y->x, input_Y->len )
== 0 );
/* condition is false */ /* condition is false */
TEST_CF_SECRET( X, bytes ); TEST_CF_SECRET( X, bytes );
TEST_CF_SECRET( Y, bytes ); TEST_CF_SECRET( Y, bytes );
mbedtls_mpi_core_cond_assign( X, Y, copy_limbs, 0 ); mbedtls_mpi_core_cond_assign( X, Y, copy_limbs, 0 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
TEST_ASSERT( memcmp( X, Y, bytes ) != 0 ); TEST_ASSERT( memcmp( X, Y, bytes ) != 0 );
/* condition is true */ /* condition is true */
@ -387,9 +379,6 @@ void mpi_core_cond_assign( data_t * input_X,
mbedtls_mpi_core_cond_assign( X, Y, copy_limbs, 1 ); mbedtls_mpi_core_cond_assign( X, Y, copy_limbs, 1 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if( copy_limbs < limbs ) if( copy_limbs < limbs )
@ -407,16 +396,20 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_core_cond_swap( data_t * input_X, void mpi_core_cond_swap( char * input_X,
data_t * input_Y, char * input_Y,
int input_bytes ) int input_bytes )
{ {
mbedtls_mpi_uint *tmp_X = NULL; mbedtls_mpi_uint *tmp_X = NULL;
mbedtls_mpi_uint *tmp_Y = NULL; mbedtls_mpi_uint *tmp_Y = NULL;
mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *X = NULL;
mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *Y = NULL;
size_t limbs_X = CHARS_TO_LIMBS( input_X->len ); size_t limbs_X;
size_t limbs_Y = CHARS_TO_LIMBS( input_Y->len ); size_t limbs_Y;
TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_X, &limbs_X, input_X ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_Y, &limbs_Y, input_Y ), 0 );
size_t limbs = limbs_X; size_t limbs = limbs_X;
size_t copy_limbs = CHARS_TO_LIMBS( input_bytes ); size_t copy_limbs = CHARS_TO_LIMBS( input_bytes );
size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t bytes = limbs * sizeof( mbedtls_mpi_uint );
@ -425,18 +418,9 @@ void mpi_core_cond_swap( data_t * input_X,
TEST_EQUAL( limbs_X, limbs_Y ); TEST_EQUAL( limbs_X, limbs_Y );
TEST_ASSERT( copy_limbs <= limbs ); TEST_ASSERT( copy_limbs <= limbs );
ASSERT_ALLOC( tmp_X, limbs );
ASSERT_ALLOC( tmp_Y, limbs );
TEST_ASSERT( mbedtls_mpi_core_read_be( tmp_X, limbs,
input_X->x, input_X->len )
== 0 );
ASSERT_ALLOC( X, limbs ); ASSERT_ALLOC( X, limbs );
memcpy( X, tmp_X, bytes ); memcpy( X, tmp_X, bytes );
TEST_ASSERT( mbedtls_mpi_core_read_be( tmp_Y, limbs,
input_Y->x, input_Y->len )
== 0 );
ASSERT_ALLOC( Y, limbs ); ASSERT_ALLOC( Y, limbs );
memcpy( Y, tmp_Y, bytes ); memcpy( Y, tmp_Y, bytes );
@ -446,9 +430,6 @@ void mpi_core_cond_swap( data_t * input_X,
mbedtls_mpi_core_cond_swap( X, Y, copy_limbs, 0 ); mbedtls_mpi_core_cond_swap( X, Y, copy_limbs, 0 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
ASSERT_COMPARE( X, bytes, tmp_X, bytes ); ASSERT_COMPARE( X, bytes, tmp_X, bytes );
ASSERT_COMPARE( Y, bytes, tmp_Y, bytes ); ASSERT_COMPARE( Y, bytes, tmp_Y, bytes );
@ -458,9 +439,6 @@ void mpi_core_cond_swap( data_t * input_X,
mbedtls_mpi_core_cond_swap( X, Y, copy_limbs, 1 ); mbedtls_mpi_core_cond_swap( X, Y, copy_limbs, 1 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if( copy_limbs < limbs ) if( copy_limbs < limbs )

70
tests/suites/test_suite_bignum_mod_raw.function
View File

@ -110,16 +110,20 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_cond_assign( data_t * input_X, void mpi_mod_raw_cond_assign( char * input_X,
data_t * input_Y, char * input_Y,
int input_bytes ) int input_bytes )
{ {
mbedtls_mpi_uint *X = NULL; mbedtls_mpi_uint *X = NULL;
mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *Y = NULL;
mbedtls_mpi_uint *buff_m = NULL; mbedtls_mpi_uint *buff_m = NULL;
mbedtls_mpi_mod_modulus m; mbedtls_mpi_mod_modulus m;
size_t limbs_X = CHARS_TO_LIMBS( input_X->len ); size_t limbs_X;
size_t limbs_Y = CHARS_TO_LIMBS( input_Y->len ); size_t limbs_Y;
TEST_EQUAL( mbedtls_test_read_mpi_core( &X, &limbs_X, input_X ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi_core( &Y, &limbs_Y, input_Y ), 0 );
size_t limbs = limbs_X; size_t limbs = limbs_X;
size_t copy_limbs = CHARS_TO_LIMBS( input_bytes ); size_t copy_limbs = CHARS_TO_LIMBS( input_bytes );
size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t bytes = limbs * sizeof( mbedtls_mpi_uint );
@ -130,24 +134,12 @@ void mpi_mod_raw_cond_assign( data_t * input_X,
TEST_EQUAL( limbs_X, limbs_Y ); TEST_EQUAL( limbs_X, limbs_Y );
TEST_ASSERT( copy_limbs <= limbs ); TEST_ASSERT( copy_limbs <= limbs );
ASSERT_ALLOC( X, limbs ); ASSERT_ALLOC( buff_m, copy_limbs );
ASSERT_ALLOC( Y, limbs ); memset( buff_m, 0xFF, copy_limbs );
TEST_EQUAL( mbedtls_mpi_mod_modulus_setup(
ASSERT_ALLOC( buff_m, limbs );
memset( buff_m, 0xFF, copy_bytes );
TEST_ASSERT( mbedtls_mpi_mod_modulus_setup(
&m, buff_m, copy_limbs, &m, buff_m, copy_limbs,
MBEDTLS_MPI_MOD_EXT_REP_BE, MBEDTLS_MPI_MOD_EXT_REP_BE,
MBEDTLS_MPI_MOD_REP_MONTGOMERY ) MBEDTLS_MPI_MOD_REP_MONTGOMERY ), 0 );
== 0 );
TEST_ASSERT( mbedtls_mpi_core_read_be( X, limbs,
input_X->x, input_X->len )
== 0 );
TEST_ASSERT( mbedtls_mpi_core_read_be( Y, limbs,
input_Y->x, input_Y->len )
== 0 );
/* condition is false */ /* condition is false */
TEST_CF_SECRET( X, bytes ); TEST_CF_SECRET( X, bytes );
@ -155,9 +147,6 @@ void mpi_mod_raw_cond_assign( data_t * input_X,
mbedtls_mpi_mod_raw_cond_assign( X, Y, &m, 0 ); mbedtls_mpi_mod_raw_cond_assign( X, Y, &m, 0 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
TEST_ASSERT( memcmp( X, Y, bytes ) != 0 ); TEST_ASSERT( memcmp( X, Y, bytes ) != 0 );
/* condition is true */ /* condition is true */
@ -166,9 +155,6 @@ void mpi_mod_raw_cond_assign( data_t * input_X,
mbedtls_mpi_mod_raw_cond_assign( X, Y, &m, 1 ); mbedtls_mpi_mod_raw_cond_assign( X, Y, &m, 1 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if( copy_limbs <limbs ) if( copy_limbs <limbs )
@ -189,8 +175,8 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void mpi_mod_raw_cond_swap( data_t * input_X, void mpi_mod_raw_cond_swap( char * input_X,
data_t * input_Y, char * input_Y,
int input_bytes ) int input_bytes )
{ {
mbedtls_mpi_uint *tmp_X = NULL; mbedtls_mpi_uint *tmp_X = NULL;
@ -199,8 +185,12 @@ void mpi_mod_raw_cond_swap( data_t * input_X,
mbedtls_mpi_uint *Y = NULL; mbedtls_mpi_uint *Y = NULL;
mbedtls_mpi_uint *buff_m = NULL; mbedtls_mpi_uint *buff_m = NULL;
mbedtls_mpi_mod_modulus m; mbedtls_mpi_mod_modulus m;
size_t limbs_X = CHARS_TO_LIMBS( input_X->len ); size_t limbs_X;
size_t limbs_Y = CHARS_TO_LIMBS( input_Y->len ); size_t limbs_Y;
TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_X, &limbs_X, input_X ), 0 );
TEST_EQUAL( mbedtls_test_read_mpi_core( &tmp_Y, &limbs_Y, input_Y ), 0 );
size_t limbs = limbs_X; size_t limbs = limbs_X;
size_t copy_limbs = CHARS_TO_LIMBS( input_bytes ); size_t copy_limbs = CHARS_TO_LIMBS( input_bytes );
size_t bytes = limbs * sizeof( mbedtls_mpi_uint ); size_t bytes = limbs * sizeof( mbedtls_mpi_uint );
@ -211,24 +201,16 @@ void mpi_mod_raw_cond_swap( data_t * input_X,
TEST_EQUAL( limbs_X, limbs_Y ); TEST_EQUAL( limbs_X, limbs_Y );
TEST_ASSERT( copy_limbs <= limbs ); TEST_ASSERT( copy_limbs <= limbs );
ASSERT_ALLOC( tmp_X, limbs );
ASSERT_ALLOC( tmp_Y, limbs );
ASSERT_ALLOC( buff_m, copy_limbs ); ASSERT_ALLOC( buff_m, copy_limbs );
memset( buff_m, 0xFF, copy_bytes ); memset( buff_m, 0xFF, copy_limbs );
TEST_ASSERT( mbedtls_mpi_mod_modulus_setup( TEST_EQUAL( mbedtls_mpi_mod_modulus_setup(
&m, buff_m, copy_limbs, &m, buff_m, copy_limbs,
MBEDTLS_MPI_MOD_EXT_REP_BE, MBEDTLS_MPI_MOD_EXT_REP_BE,
MBEDTLS_MPI_MOD_REP_MONTGOMERY ) MBEDTLS_MPI_MOD_REP_MONTGOMERY ), 0 );
== 0 );
TEST_ASSERT( mbedtls_mpi_core_read_be( tmp_X, limbs, input_X->x, input_X->len )
== 0 );
ASSERT_ALLOC( X, limbs ); ASSERT_ALLOC( X, limbs );
memcpy( X, tmp_X, bytes ); memcpy( X, tmp_X, bytes );
TEST_ASSERT( mbedtls_mpi_core_read_be( tmp_Y, limbs, input_Y->x, input_Y->len )
== 0 );
ASSERT_ALLOC( Y, bytes ); ASSERT_ALLOC( Y, bytes );
memcpy( Y, tmp_Y, bytes ); memcpy( Y, tmp_Y, bytes );
@ -238,9 +220,6 @@ void mpi_mod_raw_cond_swap( data_t * input_X,
mbedtls_mpi_mod_raw_cond_swap( X, Y, &m, 0 ); mbedtls_mpi_mod_raw_cond_swap( X, Y, &m, 0 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
ASSERT_COMPARE( X, bytes, tmp_X, bytes ); ASSERT_COMPARE( X, bytes, tmp_X, bytes );
ASSERT_COMPARE( Y, bytes, tmp_Y, bytes ); ASSERT_COMPARE( Y, bytes, tmp_Y, bytes );
@ -250,9 +229,6 @@ void mpi_mod_raw_cond_swap( data_t * input_X,
mbedtls_mpi_mod_raw_cond_swap( X, Y, &m, 1 ); mbedtls_mpi_mod_raw_cond_swap( X, Y, &m, 1 );
TEST_CF_PUBLIC( X, bytes );
TEST_CF_PUBLIC( Y, bytes );
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if( copy_limbs < limbs ) if( copy_limbs < limbs )