diff options
| author | Emilia Kasper <emilia@openssl.org> | 2015-09-01 14:56:58 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2015-09-01 20:01:38 +0200 |
| commit | 394f7b6fcc38132b8ccff0a3253b9dd15640cfc0 (patch) | |
| tree | 81cb6c4056f24b46fba9b9b39050ef80a26feb58 /crypto/pkcs12 | |
| parent | 25d6b3401ca40c9a2cbe5080449c1c2a37037777 (diff) | |
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>
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_crpt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c index 08be40c61f..e7d5ac9f6b 100644 --- a/crypto/pkcs12/p12_crpt.c +++ b/crypto/pkcs12/p12_crpt.c @@ -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); |