root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

rsa_signverify_init: Set the PARAMS after key is set 

Also, default to unrestricted pss parameters until the key is set.

Fixes #17075

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17080)
This commit is contained in:
Tomas Mraz 2021-11-19 15:16:53 +01:00
parent b33fb68a32
commit eaae5d69eb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
providers/implementations/signature/rsa_sig.c
View File

@ -190,6 +190,9 @@ static void *rsa_newctx(void *provctx, const char *propq)
prsactx->libctx = PROV_LIBCTX_OF(provctx);
prsactx->flag_allow_md = 1;
prsactx->propq = propq_copy;
/* Maximum for sign, auto for verify */
prsactx->saltlen = RSA_PSS_SALTLEN_AUTO;
prsactx->min_saltlen = -1;
return prsactx;
}
@ -406,9 +409,6 @@ static int rsa_signverify_init(void *vprsactx, void *vrsa,
prsactx->operation = operation;
if (!rsa_set_ctx_params(prsactx, params))
return 0;
/* Maximum for sign, auto for verify */
prsactx->saltlen = RSA_PSS_SALTLEN_AUTO;
prsactx->min_saltlen = -1;
@ -462,9 +462,10 @@ static int rsa_signverify_init(void *vprsactx, void *vrsa,
prsactx->saltlen = min_saltlen;
/* call rsa_setup_mgf1_md before rsa_setup_md to avoid duplication */
return rsa_setup_mgf1_md(prsactx, mgf1mdname, prsactx->propq)
&& rsa_setup_md(prsactx, mdname, prsactx->propq)
&& rsa_check_parameters(prsactx, min_saltlen);
if (!rsa_setup_mgf1_md(prsactx, mgf1mdname, prsactx->propq)
|| !rsa_setup_md(prsactx, mdname, prsactx->propq)
|| !rsa_check_parameters(prsactx, min_saltlen))
return 0;
}
}
@ -474,6 +475,9 @@ static int rsa_signverify_init(void *vprsactx, void *vrsa,
return 0;
}
if (!rsa_set_ctx_params(prsactx, params))
return 0;
return 1;
}