QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-28 18:54:36 +00:00
Code Issues Projects Releases Wiki Activity

EVP: use evp_pkey_ctx_is_legacy() to find what implementation to use

Browse Source 
We've had explicit checks for when to fall back to legacy code for
operations that use an EVP_PKEY.  Unfortunately, the checks were
radically different in different spots, so we refactor that into a
macro that gets used everywhere.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13043)
This commit is contained in:
Richard Levitte 2020-09-30 17:22:27 +02:00
parent 7d80985e17
commit f21c9c64f5
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/asymcipher.c
View File

@ -38,7 +38,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation)
*/
ERR_set_mark();
if (ctx->engine != NULL || ctx->keytype == NULL)
if (evp_pkey_ctx_is_legacy(ctx))
goto legacy;
/*

2
crypto/evp/exchange.c
View File

@ -197,7 +197,7 @@ int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
*/
ERR_set_mark();
if (ctx->keymgmt == NULL)
if (evp_pkey_ctx_is_legacy(ctx))
goto legacy;
/*

2
crypto/evp/m_sigver.c
View File

@ -80,7 +80,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
*/
ERR_set_mark();
if (locpctx->engine != NULL || locpctx->keytype == NULL)
if (evp_pkey_ctx_is_legacy(locpctx))
goto legacy;
/*

2
crypto/evp/signature.c
View File

@ -381,7 +381,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, int operation)
*/
ERR_set_mark();
if (ctx->keymgmt == NULL)
if (evp_pkey_ctx_is_legacy(ctx))
goto legacy;
/*

16
include/crypto/evp.h
View File

@ -18,6 +18,22 @@
*/
#define EVP_MD_CTX_FLAG_KEEP_PKEY_CTX 0x0400
/*
* An EVP_PKEY can have the following support states:
*
* Supports legacy implementations only:
*
* engine != NULL || keytype == NULL
*
* Supports provided implementations:
*
* engine == NULL && keytype != NULL
*/
#define evp_pkey_ctx_is_legacy(ctx) \
((ctx)->engine != NULL || (ctx)->keytype == NULL)
#define evp_pkey_ctx_is_provided(ctx) \
(!evp_pkey_ctx_is_legacy(ctx))
struct evp_pkey_ctx_st {
/* Actual operation */
int operation;