projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-introduce legacy EVP_PKEY types for provided keys
[oweals/openssl.git]
/
crypto
/
evp
/
pmeth_lib.c
diff --git
a/crypto/evp/pmeth_lib.c
b/crypto/evp/pmeth_lib.c
index eca517812933b156212b86bb0535997dd4c4d00e..e4327b3a941f3667b0c86f57eefae6886b1b74e4 100644
(file)
--- a/
crypto/evp/pmeth_lib.c
+++ b/
crypto/evp/pmeth_lib.c
@@
-155,10
+155,10
@@
static EVP_PKEY_CTX *int_ctx_new(OPENSSL_CTX *libctx,
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 the
internal key is provided, we extract the keytype from its
+ *
keymgmt and skip over the legacy code
.
*/
*/
- if (pkey != NULL &&
pkey->type == EVP_PKEY_NONE
) {
+ if (pkey != NULL &&
evp_pkey_is_provided(pkey)
) {
/* If we have an engine, something went wrong somewhere... */
if (!ossl_assert(e == NULL))
return NULL;
/* If we have an engine, something went wrong somewhere... */
if (!ossl_assert(e == NULL))
return NULL;