Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make EVP_PKEY_CTX initialization more precise #10308

Closed
wants to merge 2 commits into from
Closed

Make EVP_PKEY_CTX initialization more precise #10308

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
339f777
Make EVP_PKEY_CTX initialization more precise
levitte Oct 31, 2019
30cb9b4
Change EVP_PKEY_CTX_new_provided() to take a library context too.
levitte Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion crypto/evp/pmeth_lib.c
View file
Open in desktop
Expand Up @@ -132,8 +132,24 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e,
return 0;
id = pkey->type;
}
name = OBJ_nid2sn(id);

/*
* Here, we extract what information we can for the purpose of
* supporting usage with implementations from providers, to make
* for a smooth transition from legacy stuff to provider based stuff.
*
* If an engine is given, this is entirely legacy, and we should not
* pretend anything else, so we only set the name when no engine is
* given. If both are already given, someone made a mistake, and
* since that can only happen internally, it's safe to make an
* assertion.
*/
if (!ossl_assert(e == NULL || name == NULL))
return NULL;
if (e == NULL)
name = OBJ_nid2sn(id);
propquery = NULL;

#ifndef OPENSSL_NO_ENGINE
if (e == NULL && pkey != NULL)
e = pkey->pmeth_engine != NULL ? pkey->pmeth_engine : pkey->engine;
Expand Down