mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

EVP: make it possible to init EVP_PKEY_CTX with provided EVP_PKEY

Browse Source 
The case when EVP_PKEY_CTX_new() is called with a provided EVP_PKEY
(no legacy data) wasn't handled properly.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10618)
This commit is contained in:
Richard Levitte 2019-12-02 12:00:58 +01:00
parent 19f909856d
commit 982efd7765
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/evp/pmeth_lib.c
View File

@ -127,11 +127,28 @@ static EVP_PKEY_CTX *int_ctx_new(OPENSSL_CTX *libctx,
if (pkey == NULL && e == NULL && id == -1) if (pkey == NULL && e == NULL && id == -1)
goto common; goto common;
/*
* If the key doesn't contain anything legacy, then it must be provided,
* so we extract the necessary information and use that.
*/
if (pkey != NULL && pkey->pkey.ptr == NULL) {
/* If we have an engine, something went wrong somewhere... */
if (!ossl_assert(e == NULL))
return NULL;
name = evp_first_name(pkey->pkeys[0].keymgmt->prov,
pkey->pkeys[0].keymgmt->name_id);
/*
* TODO: I wonder if the EVP_PKEY should have the name and propquery
* that were used when building it.... /RL
*/
goto common;
}
/* TODO(3.0) Legacy code should be removed when all is provider based */ /* TODO(3.0) Legacy code should be removed when all is provider based */
/* BEGIN legacy */ /* BEGIN legacy */
if (id == -1) { if (id == -1) {
if (pkey == NULL) if (pkey == NULL)
return 0; return NULL;
id = pkey->type; id = pkey->type;
} }