RT4002: check for NULL cipher in p12_crpt.c
authorEmilia Kasper <emilia@openssl.org>
Tue, 1 Sep 2015 12:56:58 +0000 (14:56 +0200)
committerEmilia Kasper <emilia@openssl.org>
Tue, 1 Sep 2015 18:06:08 +0000 (20:06 +0200)
commitbae16c98c1aed3c67c3328541c8cce015bb4c344
tree9274cb937a71757a9b9cd01035ea4c2f94b81d5f
parent9d4798a9e0e1d2a366adabafcf0f007f42cd5fa7
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>
(cherry picked from commit 394f7b6fcc38132b8ccff0a3253b9dd15640cfc0)
crypto/pkcs12/p12_crpt.c