diff options
| author | Matt Caswell <matt@openssl.org> | 2020-04-10 18:28:24 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-04-17 12:26:56 +0100 |
| commit | 629c72db5f8af3312fd89188298ce464186470d1 (patch) | |
| tree | 46093f9f44f37422ee717a7b973437bb788a85b3 /crypto/dh | |
| parent | 7da7b27eec58d1efc7012f002c45ddbdd61a5e79 (diff) | |
When calling the import_to function pass the libctx too
Previously import_to just took an EVP_PKEY as the argument. However we
need to some additional context data as well - specifically the libctx.
Therefore we pass an EVP_PKEY_CTX instead to hold the combination of
both of these things.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11536)
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_ameth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 9c1fa0388d..ea92fc9db7 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -548,10 +548,11 @@ err: return rv; } -static int dh_pkey_import_from(const OSSL_PARAM params[], void *key) +static int dh_pkey_import_from(const OSSL_PARAM params[], void *vpctx) { - EVP_PKEY *pkey = key; - DH *dh = DH_new(); + EVP_PKEY_CTX *pctx = vpctx; + EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx); + DH *dh = dh_new_with_libctx(pctx->libctx); if (dh == NULL) { ERR_raise(ERR_LIB_DH, ERR_R_MALLOC_FAILURE); |