mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-28 00:21:48 +03:00
Merge pull request #4588 from TRodziewicz/remove_MD2_MD4_RC4_Blowfish_and_XTEA
Remove MD2, MD4, RC4, Blowfish and XTEA
This commit is contained in:
@ -1170,24 +1170,6 @@ static int pk_parse_key_pkcs8_encrypted_der(
|
||||
|
||||
decrypted = 1;
|
||||
}
|
||||
else if( MBEDTLS_OID_CMP( MBEDTLS_OID_PKCS12_PBE_SHA1_RC4_128, &pbe_alg_oid ) == 0 )
|
||||
{
|
||||
if( ( ret = mbedtls_pkcs12_pbe_sha1_rc4_128( &pbe_params,
|
||||
MBEDTLS_PKCS12_PBE_DECRYPT,
|
||||
pwd, pwdlen,
|
||||
p, len, buf ) ) != 0 )
|
||||
{
|
||||
return( ret );
|
||||
}
|
||||
|
||||
// Best guess for password mismatch when using RC4. If first tag is
|
||||
// not MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE
|
||||
//
|
||||
if( *buf != ( MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) )
|
||||
return( MBEDTLS_ERR_PK_PASSWORD_MISMATCH );
|
||||
|
||||
decrypted = 1;
|
||||
}
|
||||
else
|
||||
#endif /* MBEDTLS_PKCS12_C */
|
||||
#if defined(MBEDTLS_PKCS5_C)
|
||||
|
Reference in New Issue
Block a user