Fix unchecked error codes in ecp_gen_keypair()
diff --git a/library/ecp.c b/library/ecp.c
index 95ff4f0..b2690c9 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -1742,6 +1742,7 @@
int (*f_rng)(void *, unsigned char *, size_t),
void *p_rng )
{
+ int ret;
size_t n_size = (grp->nbits + 7) / 8;
#if defined(POLARSSL_ECP_MONTGOMERY)
@@ -1750,19 +1751,19 @@
/* [M225] page 5 */
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 */
b = mpi_msb( d ) - 1; /* mpi_msb is one-based */
if( b > grp->nbits )
- mpi_shift_r( d, b - grp->nbits );
+ MPI_CHK( mpi_shift_r( d, b - grp->nbits ) );
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 */
- mpi_set_bit( d, 0, 0 );
- mpi_set_bit( d, 1, 0 );
- mpi_set_bit( d, 2, 0 );
+ MPI_CHK( mpi_set_bit( d, 0, 0 ) );
+ MPI_CHK( mpi_set_bit( d, 1, 0 ) );
+ MPI_CHK( mpi_set_bit( d, 2, 0 ) );
}
else
#endif
@@ -1782,9 +1783,9 @@
*/
do
{
- f_rng( p_rng, rnd, n_size );
- mpi_read_binary( d, rnd, n_size );
- mpi_shift_r( d, 8 * n_size - grp->nbits );
+ MPI_CHK( f_rng( p_rng, rnd, n_size ) );
+ MPI_CHK( mpi_read_binary( d, rnd, n_size ) );
+ MPI_CHK( mpi_shift_r( d, 8 * n_size - grp->nbits ) );
if( count++ > 10 )
return( POLARSSL_ERR_ECP_RANDOM_FAILED );
@@ -1796,6 +1797,10 @@
#endif
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 ) );
}