Commit bae16c98 authored by Emilia Kasper's avatar Emilia Kasper
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 394f7b6f)
parent 9d4798a9

crypto/pkcs12/p12_crpt.c

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
    const unsigned char *pbuf;

    unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];



    if (cipher == NULL)

        return 0;



    /* Extract useful info from parameter */

    if (param == NULL || param->type != V_ASN1_SEQUENCE ||

        param->value.sequence == NULL) {