Commit 85143709 authored by Daniel DeFreez's avatar Daniel DeFreez Committed by Paul Yang
Browse files

Fix null pointer dereference in cms_RecipientInfo_kari_init 



CLA: trivial

Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarPaul Yang <yang.yang@baishancloud.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8137)

(cherry picked from commit b754a8a1590b8c5c9662c8a0ba49573991488b20)
parent 2cf7fd69

crypto/cms/cms_kari.c

+4 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari, 
    return rv;

}



/* Initialise a ktri based on passed certificate and key */

/* Initialise a kari based on passed certificate and key */



int cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,

                                EVP_PKEY *pk, unsigned int flags)
@@ -299,6 +299,9 @@ int cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip, 
    kari->version = 3;



    rek = M_ASN1_new_of(CMS_RecipientEncryptedKey);

    if (rek == NULL)

        return 0;



    if (!sk_CMS_RecipientEncryptedKey_push(kari->recipientEncryptedKeys, rek)) {

        M_ASN1_free_of(rek, CMS_RecipientEncryptedKey);

        return 0;