mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-03-23 05:25:09 +00:00
Merge pull request #3067 from gilles-peskine-arm/fuzz_pubkey-rsa_export
Fix fuzz_pubkey on valid RSA keys
This commit is contained in:
commit
59e584949d
|
@ -44,20 +44,26 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
|||
else
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECP_C)
|
||||
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY )
|
||||
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY ||
|
||||
mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY_DH )
|
||||
{
|
||||
mbedtls_ecp_keypair *ecp;
|
||||
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk );
|
||||
mbedtls_ecp_group_id grp_id = ecp->grp.id;
|
||||
const mbedtls_ecp_curve_info *curve_info =
|
||||
mbedtls_ecp_curve_info_from_grp_id( grp_id );
|
||||
|
||||
ecp = mbedtls_pk_ec( pk );
|
||||
if (ecp) {
|
||||
ret = 0;
|
||||
}
|
||||
/* If the curve is not supported, the key should not have been
|
||||
* accepted. */
|
||||
if( curve_info == NULL )
|
||||
abort( );
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
ret = 0;
|
||||
}
|
||||
{
|
||||
/* The key is valid but is not of a supported type.
|
||||
* This should not happen. */
|
||||
abort( );
|
||||
}
|
||||
}
|
||||
mbedtls_pk_free( &pk );
|
||||
#else
|
||||
|
|
|
@ -21,7 +21,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
|||
mbedtls_mpi_init( &DQ ); mbedtls_mpi_init( &QP );
|
||||
|
||||
rsa = mbedtls_pk_rsa( pk );
|
||||
if ( mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ) != 0 ) {
|
||||
if ( mbedtls_rsa_export( rsa, &N, NULL, NULL, NULL, &E ) != 0 ) {
|
||||
abort();
|
||||
}
|
||||
if ( mbedtls_rsa_export( rsa, &N, &P, &Q, &D, &E ) != MBEDTLS_ERR_RSA_BAD_INPUT_DATA ) {
|
||||
abort();
|
||||
}
|
||||
if ( mbedtls_rsa_export_crt( rsa, &DP, &DQ, &QP ) != MBEDTLS_ERR_RSA_BAD_INPUT_DATA ) {
|
||||
|
@ -36,20 +39,30 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
|
|||
else
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECP_C)
|
||||
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY )
|
||||
if( mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY ||
|
||||
mbedtls_pk_get_type( &pk ) == MBEDTLS_PK_ECKEY_DH )
|
||||
{
|
||||
mbedtls_ecp_keypair *ecp;
|
||||
mbedtls_ecp_keypair *ecp = mbedtls_pk_ec( pk );
|
||||
mbedtls_ecp_group_id grp_id = ecp->grp.id;
|
||||
const mbedtls_ecp_curve_info *curve_info =
|
||||
mbedtls_ecp_curve_info_from_grp_id( grp_id );
|
||||
|
||||
ecp = mbedtls_pk_ec( pk );
|
||||
//dummy use of value
|
||||
if (ecp) {
|
||||
ret = 0;
|
||||
}
|
||||
/* If the curve is not supported, the key should not have been
|
||||
* accepted. */
|
||||
if( curve_info == NULL )
|
||||
abort( );
|
||||
|
||||
/* It's a public key, so the private value should not have
|
||||
* been changed from its initialization to 0. */
|
||||
if( mbedtls_mpi_cmp_int( &ecp->d, 0 ) != 0 )
|
||||
abort( );
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
ret = 0;
|
||||
/* The key is valid but is not of a supported type.
|
||||
* This should not happen. */
|
||||
abort( );
|
||||
}
|
||||
}
|
||||
mbedtls_pk_free( &pk );
|
||||
|
|
Loading…
Reference in a new issue