RT4002: check for NULL cipher in p12_crpt.c
The NULL cipher case can't actually happen because we have no EVP_PBE_CTL combinations where cipher_nid is -1 and keygen is PKCS12_PBE_keyivgen. But make the code more obviously correct. Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
parent
25d6b3401c
commit
394f7b6fcc
1 changed files with 3 additions and 0 deletions
|
@ -76,6 +76,9 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
|
|||
unsigned char *salt;
|
||||
unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
|
||||
|
||||
if (cipher == NULL)
|
||||
return 0;
|
||||
|
||||
/* Extract useful info from parameter */
|
||||
|
||||
pbe = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBEPARAM), param);
|
||||
|
|
Loading…
Reference in a new issue