yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 10:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct parsing checks in pk_parse_key

Browse source 
Two code-paths in `pk_parse_key` returned success on a failure in `pk_setup`.
This commit is contained in:
Hanno Becker 2017-09-28 16:52:51 +01:00
parent ea65d0377c
commit 20f4c78f26
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
library/pkparse.c
View file

@ -1195,29 +1195,29 @@ int pk_parse_key( pk_context *pk,
pk_free( pk ); pk_free( pk );
#if defined(POLARSSL_RSA_C) #if defined(POLARSSL_RSA_C)
if( ( pk_info = pk_info_from_type( POLARSSL_PK_RSA ) ) == NULL ) pk_info = pk_info_from_type( POLARSSL_PK_RSA );
return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 || if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 ||
( ret = pk_parse_key_pkcs1_der( pk_rsa( *pk ), key, keylen ) ) == 0 ) ( ret = pk_parse_key_pkcs1_der( pk_rsa( *pk ), key, keylen ) ) != 0 )
{
pk_free( pk );
}
else
{ {
return( 0 ); return( 0 );
} }
pk_free( pk );
#endif /* POLARSSL_RSA_C */ #endif /* POLARSSL_RSA_C */
#if defined(POLARSSL_ECP_C) #if defined(POLARSSL_ECP_C)
if( ( pk_info = pk_info_from_type( POLARSSL_PK_ECKEY ) ) == NULL ) pk_info = pk_info_from_type( POLARSSL_PK_ECKEY );
return( POLARSSL_ERR_PK_UNKNOWN_PK_ALG );
if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 || if( ( ret = pk_init_ctx( pk, pk_info ) ) != 0 ||
( ret = pk_parse_key_sec1_der( pk_ec( *pk ), key, keylen ) ) == 0 ) ( ret = pk_parse_key_sec1_der( pk_ec( *pk ), key, keylen ) ) != 0 )
{
pk_free( pk );
}
else
{ {
return( 0 ); return( 0 );
} }
pk_free( pk );
#endif /* POLARSSL_ECP_C */ #endif /* POLARSSL_ECP_C */
return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT ); return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );