From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 22 Sep 2020 05:53:27 +0000 (+1000)
Subject: Fix missing propq in ecdh_cms_set_shared_info()
X-Git-Tag: openssl-3.0.0-alpha7~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4b3ea73a7b2be5cdbfc0036ec0b1fead1fcd898;p=thirdparty%2Fopenssl.git

Fix missing propq in ecdh_cms_set_shared_info()

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12944)
---

diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index 67705d6fe40..75f82739ec3 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -962,7 +962,7 @@ static int ecdh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
     if (kekctx == NULL)
         goto err;
     name = OBJ_nid2sn(OBJ_obj2nid(kekalg->algorithm));
-    kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, NULL);
+    kekcipher = EVP_CIPHER_fetch(pctx->libctx, name, pctx->propquery);
     if (kekcipher == NULL || EVP_CIPHER_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
         goto err;
     if (!EVP_EncryptInit_ex(kekctx, kekcipher, NULL, NULL, NULL))