Commit 7a317fa0 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix ECDH key identifier support. 



PR#3789

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 34b0a927

crypto/cms/cms_kari.c

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
DECLARE_ASN1_ITEM(CMS_KeyAgreeRecipientInfo)

DECLARE_ASN1_ITEM(CMS_RecipientEncryptedKey)

DECLARE_ASN1_ITEM(CMS_OriginatorPublicKey)

DECLARE_ASN1_ITEM(CMS_RecipientKeyIdentifier)



/* Key Agreement Recipient Info (KARI) routines */
@@ -360,6 +361,9 @@ int cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip, 


    if (flags & CMS_USE_KEYID) {

        rek->rid->type = CMS_REK_KEYIDENTIFIER;

        rek->rid->d.rKeyId = M_ASN1_new_of(CMS_RecipientKeyIdentifier);

        if (rek->rid->d.rKeyId == NULL)

            return 0;

        if (!cms_set1_keyid(&rek->rid->d.rKeyId->subjectKeyIdentifier, recip))

            return 0;

    } else {