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:03:04 +0000 (20:03 +0200)
commit59793f5c1e0138928d9e5fc24c743d8e38d450e1
treee16b13eb0bf3bac3e8b7d816cb6d78ee3efc473a
parent5f623eb61655688501cb1817a7ad0592299d894a
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