]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix missing propq in ecdh_cms_set_shared_info()
authorShane Lontis <shane.lontis@oracle.com>
Tue, 22 Sep 2020 05:53:27 +0000 (15:53 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Wed, 23 Sep 2020 07:31:40 +0000 (17:31 +1000)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12944)

crypto/ec/ec_ameth.c

index 67705d6fe40dba34445b9fa9b988074bb6f82376..75f82739ec31a351cd136378fa37315ec6b59d0c 100644 (file)
@@ -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))