mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
evp_pkey_ctx_setget_params_to_ctrl(): Always properly set ctx.action_type
Fixes #24698 Some applicable translations are bidirectional so they have NONE action_type. However we need to set the real action_type in the ctx. Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/24709)
This commit is contained in:
parent
30dc37d798
commit
55c1458303
@ -2845,7 +2845,7 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
|
||||
fixup_args_fn *fixup = default_fixup_args;
|
||||
int ret;
|
||||
|
||||
tmpl.action_type = action_type;
|
||||
ctx.action_type = tmpl.action_type = action_type;
|
||||
tmpl.keytype1 = tmpl.keytype2 = keytype;
|
||||
tmpl.optype = optype;
|
||||
tmpl.param_key = params->key;
|
||||
@ -2854,7 +2854,6 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
|
||||
if (translation != NULL) {
|
||||
if (translation->fixup_args != NULL)
|
||||
fixup = translation->fixup_args;
|
||||
ctx.action_type = translation->action_type;
|
||||
ctx.ctrl_cmd = translation->ctrl_num;
|
||||
}
|
||||
ctx.pctx = pctx;
|
||||
|
Loading…
Reference in New Issue
Block a user