mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-28 00:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bignum_mod: Style changes

Browse Source 
This patch addresses review comments with regards to style of
`mbedtls_mpi_mod_modulus_setup/free()`.

It also removes a test check which was triggering a use-after-free.

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
This commit is contained in:
Minos Galanakis 2022-10-27 12:22:22 +01:00
parent dd365a526f
commit 771c47055f
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/bignum_mod.c
View File

@ -81,7 +81,8 @@ void mbedtls_mpi_mod_modulus_free( mbedtls_mpi_mod_modulus *m )
m->limbs ); m->limbs );
mbedtls_free( (mbedtls_mpi_uint *)m->rep.mont.rr ); mbedtls_free( (mbedtls_mpi_uint *)m->rep.mont.rr );
m->rep.mont.rr = NULL; m->rep.mont.rr = NULL;
m->rep.mont.mm = 0; break; m->rep.mont.mm = 0;
break;
case MBEDTLS_MPI_MOD_REP_OPT_RED: case MBEDTLS_MPI_MOD_REP_OPT_RED:
mbedtls_free( m->rep.ored ); mbedtls_free( m->rep.ored );
break; break;
@ -110,11 +111,11 @@ static int set_mont_const_square( const mbedtls_mpi_uint **X,
if ( A == NULL || limbs == 0 || limbs >= ( MBEDTLS_MPI_MAX_LIMBS / 2 ) - 2 ) if ( A == NULL || limbs == 0 || limbs >= ( MBEDTLS_MPI_MAX_LIMBS / 2 ) - 2 )
goto cleanup; goto cleanup;
if ( !mbedtls_mpi_grow( &N, limbs )) if ( mbedtls_mpi_grow( &N, limbs ))
memcpy( N.p, A, sizeof(mbedtls_mpi_uint) * limbs );
else
goto cleanup; goto cleanup;
memcpy( N.p, A, sizeof(mbedtls_mpi_uint) * limbs );
mbedtls_mpi_core_get_mont_r2_unsafe(&RR, &N); mbedtls_mpi_core_get_mont_r2_unsafe(&RR, &N);
*X = RR.p; *X = RR.p;

7
tests/suites/test_suite_bignum_mod.function
View File

@ -18,7 +18,6 @@ void mpi_mod_setup( int ext_rep, int int_rep, int iret )
mbedtls_mpi_uint mp[MLIMBS]; mbedtls_mpi_uint mp[MLIMBS];
mbedtls_mpi_mod_modulus m; mbedtls_mpi_mod_modulus m;
const size_t mp_size = sizeof(mbedtls_mpi_uint); const size_t mp_size = sizeof(mbedtls_mpi_uint);
mbedtls_mpi_uint * rr;
int ret; int ret;
memset( mp, 0xFF, mp_size ); memset( mp, 0xFF, mp_size );
@ -34,8 +33,6 @@ void mpi_mod_setup( int ext_rep, int int_rep, int iret )
TEST_ASSERT( m.rep.mont.rr != NULL ); TEST_ASSERT( m.rep.mont.rr != NULL );
TEST_ASSERT( m.rep.mont.mm != 0 ); TEST_ASSERT( m.rep.mont.mm != 0 );
/* Keep a copy of the memory location used to store Montgomery const */
rr = (mbedtls_mpi_uint *)m.rep.mont.rr;
} }
/* Address sanitiser should catch if we try to free mp */ /* Address sanitiser should catch if we try to free mp */
@ -54,10 +51,6 @@ void mpi_mod_setup( int ext_rep, int int_rep, int iret )
TEST_ASSERT( m.rep.mont.rr == NULL ); TEST_ASSERT( m.rep.mont.rr == NULL );
TEST_ASSERT( m.rep.mont.mm == 0 ); TEST_ASSERT( m.rep.mont.mm == 0 );
/* mbedtls_mpi_mod_modulus_free() has set the
* (mbedtls_mpi_uint *)m.rep.mont.rr -> NULL.
* Verify that the actual data have been zeroed */
ASSERT_COMPARE( rr, mp_size, &mp, mp_size );
} }
exit: exit:
/* It should be safe to call an mbedtls free several times */ /* It should be safe to call an mbedtls free several times */