yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-03 05:01:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing MPI_CHK around mpi functions

Browse source
This commit is contained in:
Paul Bakker 2014-04-17 12:42:41 +02:00
parent 243d61894c
commit 7890e62a1f
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/asn1write.c
View file

@ -85,7 +85,7 @@ int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X )
return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL ); return( POLARSSL_ERR_ASN1_BUF_TOO_SMALL );
(*p) -= len; (*p) -= len;
mpi_write_binary( X, *p, len ); MPI_CHK( mpi_write_binary( X, *p, len ) );
// DER format assumes 2s complement for numbers, so the leftmost bit // DER format assumes 2s complement for numbers, so the leftmost bit
// should be 0 for positive numbers and 1 for negative numbers. // should be 0 for positive numbers and 1 for negative numbers.
@ -102,7 +102,10 @@ int asn1_write_mpi( unsigned char **p, unsigned char *start, mpi *X )
ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) ); ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_INTEGER ) ); ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_INTEGER ) );
return( len ); ret = (int) len;
cleanup:
return( ret );
} }
int asn1_write_null( unsigned char **p, unsigned char *start ) int asn1_write_null( unsigned char **p, unsigned char *start )

11
library/dhm.c
View file

@ -75,8 +75,9 @@ static int dhm_check_range( const mpi *param, const mpi *P )
int ret = POLARSSL_ERR_DHM_BAD_INPUT_DATA; int ret = POLARSSL_ERR_DHM_BAD_INPUT_DATA;
mpi_init( &L ); mpi_init( &U ); mpi_init( &L ); mpi_init( &U );
mpi_lset( &L, 2 );
mpi_sub_int( &U, P, 2 ); MPI_CHK( mpi_lset( &L, 2 ) );
MPI_CHK( mpi_sub_int( &U, P, 2 ) );
if( mpi_cmp_mpi( param, &L ) >= 0 && if( mpi_cmp_mpi( param, &L ) >= 0 &&
mpi_cmp_mpi( param, &U ) <= 0 ) mpi_cmp_mpi( param, &U ) <= 0 )
@ -84,8 +85,8 @@ static int dhm_check_range( const mpi *param, const mpi *P )
ret = 0; ret = 0;
} }
cleanup:
mpi_free( &L ); mpi_free( &U ); mpi_free( &L ); mpi_free( &U );
return( ret ); return( ret );
} }
@ -139,7 +140,7 @@ int dhm_make_params( dhm_context *ctx, int x_size,
mpi_fill_random( &ctx->X, x_size, f_rng, p_rng ); mpi_fill_random( &ctx->X, x_size, f_rng, p_rng );
while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 ) while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 )
mpi_shift_r( &ctx->X, 1 ); MPI_CHK( mpi_shift_r( &ctx->X, 1 ) );
if( count++ > 10 ) if( count++ > 10 )
return( POLARSSL_ERR_DHM_MAKE_PARAMS_FAILED ); return( POLARSSL_ERR_DHM_MAKE_PARAMS_FAILED );
@ -225,7 +226,7 @@ int dhm_make_public( dhm_context *ctx, int x_size,
mpi_fill_random( &ctx->X, x_size, f_rng, p_rng ); mpi_fill_random( &ctx->X, x_size, f_rng, p_rng );
while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 ) while( mpi_cmp_mpi( &ctx->X, &ctx->P ) >= 0 )
mpi_shift_r( &ctx->X, 1 ); MPI_CHK( mpi_shift_r( &ctx->X, 1 ) );
if( count++ > 10 ) if( count++ > 10 )
return( POLARSSL_ERR_DHM_MAKE_PUBLIC_FAILED ); return( POLARSSL_ERR_DHM_MAKE_PUBLIC_FAILED );

21
library/rsa.c
View file

@ -1424,6 +1424,7 @@ static int myrand( void *rng_state, unsigned char *output, size_t len )
*/ */
int rsa_self_test( int verbose ) int rsa_self_test( int verbose )
{ {
int ret = 0;
size_t len; size_t len;
rsa_context rsa; rsa_context rsa;
unsigned char rsa_plaintext[PT_LEN]; unsigned char rsa_plaintext[PT_LEN];
@ -1436,14 +1437,14 @@ int rsa_self_test( int verbose )
rsa_init( &rsa, RSA_PKCS_V15, 0 ); rsa_init( &rsa, RSA_PKCS_V15, 0 );
rsa.len = KEY_LEN; rsa.len = KEY_LEN;
mpi_read_string( &rsa.N , 16, RSA_N ); MPI_CHK( mpi_read_string( &rsa.N , 16, RSA_N ) );
mpi_read_string( &rsa.E , 16, RSA_E ); MPI_CHK( mpi_read_string( &rsa.E , 16, RSA_E ) );
mpi_read_string( &rsa.D , 16, RSA_D ); MPI_CHK( mpi_read_string( &rsa.D , 16, RSA_D ) );
mpi_read_string( &rsa.P , 16, RSA_P ); MPI_CHK( mpi_read_string( &rsa.P , 16, RSA_P ) );
mpi_read_string( &rsa.Q , 16, RSA_Q ); MPI_CHK( mpi_read_string( &rsa.Q , 16, RSA_Q ) );
mpi_read_string( &rsa.DP, 16, RSA_DP ); MPI_CHK( mpi_read_string( &rsa.DP, 16, RSA_DP ) );
mpi_read_string( &rsa.DQ, 16, RSA_DQ ); MPI_CHK( mpi_read_string( &rsa.DQ, 16, RSA_DQ ) );
mpi_read_string( &rsa.QP, 16, RSA_QP ); MPI_CHK( mpi_read_string( &rsa.QP, 16, RSA_QP ) );
if( verbose != 0 ) if( verbose != 0 )
printf( " RSA key validation: " ); printf( " RSA key validation: " );
@ -1523,9 +1524,9 @@ int rsa_self_test( int verbose )
printf( "passed\n\n" ); printf( "passed\n\n" );
#endif /* POLARSSL_SHA1_C */ #endif /* POLARSSL_SHA1_C */
cleanup:
rsa_free( &rsa ); rsa_free( &rsa );
return( ret );
return( 0 );
} }
#endif #endif