diff options
| author | Daniel DeFreez <daniel@defreez.com> | 2019-02-13 14:26:14 +0800 |
|---|---|---|
| committer | Paul Yang <yang.yang@baishancloud.com> | 2019-02-13 14:30:48 +0800 |
| commit | 851437094aca6067d425f7869751df41cde775fe (patch) | |
| tree | 48a9e34b6d10df543c0891b4bfbb41bb4f3cc0f3 /crypto/cms | |
| parent | 2cf7fd698ec1375421f91338ff8a44e7da5238b6 (diff) | |
Fix null pointer dereference in cms_RecipientInfo_kari_init
CLA: trivial
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8137)
(cherry picked from commit b754a8a1590b8c5c9662c8a0ba49573991488b20)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_kari.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 3bc46febf6..f104eec29d 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -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; |