From 8c631cfaa1f812ed990053c1b0c73f3a3f369aca Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 3 Mar 2021 09:44:25 +0100 Subject: ecx_set_priv_key: Try to obtain libctx from the pkey's keymgmt We can try to do that although for legacy keys the keymgmt will not be set. This function will disappear with legacy support removed. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14404) --- crypto/ec/ecx_meth.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 54415d86db..fac1ba7270 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -14,12 +14,13 @@ #include "internal/deprecated.h" #include -#include "internal/cryptlib.h" #include #include #include #include -#include "openssl/param_build.h" +#include +#include "internal/cryptlib.h" +#include "internal/provider.h" #include "crypto/asn1.h" #include "crypto/evp.h" #include "crypto/ecx.h" @@ -334,14 +335,24 @@ static int ecd_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv, size_t len) { + OSSL_LIB_CTX *libctx = NULL; + + if (pkey->keymgmt != NULL) + libctx = ossl_provider_libctx(EVP_KEYMGMT_provider(pkey->keymgmt)); + return ecx_key_op(pkey, pkey->ameth->pkey_id, NULL, priv, len, - KEY_OP_PRIVATE, NULL, NULL); + KEY_OP_PRIVATE, libctx, NULL); } static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len) { + OSSL_LIB_CTX *libctx = NULL; + + if (pkey->keymgmt != NULL) + libctx = ossl_provider_libctx(EVP_KEYMGMT_provider(pkey->keymgmt)); + return ecx_key_op(pkey, pkey->ameth->pkey_id, NULL, pub, len, - KEY_OP_PUBLIC, NULL, NULL); + KEY_OP_PUBLIC, libctx, NULL); } static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv, -- cgit v1.2.3