diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-22 15:53:27 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-23 17:31:40 +1000 |
| commit | c4b3ea73a7b2be5cdbfc0036ec0b1fead1fcd898 (patch) | |
| tree | 91530a40f703551090aee989bcc7b4a5da73054e /crypto/ec/ec_ameth.c | |
| parent | 8dbef010e7e6ecc07a9c8142cf26c8768fd55dc2 (diff) | |
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)
Diffstat (limited to 'crypto/ec/ec_ameth.c')
| -rw-r--r-- | crypto/ec/ec_ameth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 67705d6fe4..75f82739ec 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)) |