yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix unchecked error codes in ecp_gen_keypair()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-01-03 12:54:00 +01:00
parent fae079e4c5
commit c9573998ca
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
library/ecp.c
View file

@ -1742,6 +1742,7 @@ int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
int (*f_rng)(void *, unsigned char *, size_t), int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng ) void *p_rng )
{ {
int ret;
size_t n_size = (grp->nbits + 7) / 8; size_t n_size = (grp->nbits + 7) / 8;
#if defined(POLARSSL_ECP_MONTGOMERY) #if defined(POLARSSL_ECP_MONTGOMERY)
@ -1750,19 +1751,19 @@ int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
/* [M225] page 5 */ /* [M225] page 5 */
size_t b; size_t b;
mpi_fill_random( d, n_size, f_rng, p_rng ); MPI_CHK( mpi_fill_random( d, n_size, f_rng, p_rng ) );
/* Make sure the most significant bit is nbits */ /* Make sure the most significant bit is nbits */
b = mpi_msb( d ) - 1; /* mpi_msb is one-based */ b = mpi_msb( d ) - 1; /* mpi_msb is one-based */
if( b > grp->nbits ) if( b > grp->nbits )
mpi_shift_r( d, b - grp->nbits ); MPI_CHK( mpi_shift_r( d, b - grp->nbits ) );
else else
mpi_set_bit( d, grp->nbits, 1 ); MPI_CHK( mpi_set_bit( d, grp->nbits, 1 ) );
/* Make sure the last three bits are unset */ /* Make sure the last three bits are unset */
mpi_set_bit( d, 0, 0 ); MPI_CHK( mpi_set_bit( d, 0, 0 ) );
mpi_set_bit( d, 1, 0 ); MPI_CHK( mpi_set_bit( d, 1, 0 ) );
mpi_set_bit( d, 2, 0 ); MPI_CHK( mpi_set_bit( d, 2, 0 ) );
} }
else else
#endif #endif
@ -1782,9 +1783,9 @@ int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
*/ */
do do
{ {
f_rng( p_rng, rnd, n_size ); MPI_CHK( f_rng( p_rng, rnd, n_size ) );
mpi_read_binary( d, rnd, n_size ); MPI_CHK( mpi_read_binary( d, rnd, n_size ) );
mpi_shift_r( d, 8 * n_size - grp->nbits ); MPI_CHK( mpi_shift_r( d, 8 * n_size - grp->nbits ) );
if( count++ > 10 ) if( count++ > 10 )
return( POLARSSL_ERR_ECP_RANDOM_FAILED ); return( POLARSSL_ERR_ECP_RANDOM_FAILED );
@ -1796,6 +1797,10 @@ int ecp_gen_keypair( ecp_group *grp, mpi *d, ecp_point *Q,
#endif #endif
return( POLARSSL_ERR_ECP_BAD_INPUT_DATA ); return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
cleanup:
if( ret != 0 )
return( ret );
return( ecp_mul( grp, Q, d, &grp->G, f_rng, p_rng ) ); return( ecp_mul( grp, Q, d, &grp->G, f_rng, p_rng ) );
} }