diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-22 15:43:32 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-23 17:31:40 +1000 |
| commit | 719523c76df0850ba736ede48cc86d48eed9f725 (patch) | |
| tree | 71e39a4626e1eaa575962d86563efdf53c15b01e /providers | |
| parent | 81777339e9ed62cd3b801bf225fa1f2aba4b30dd (diff) | |
| download | openssl-719523c76df0850ba736ede48cc86d48eed9f725.tar.gz | |
Change rsa gen so it can use the propq from OSSL_PKEY_PARAM_RSA_DIGEST
rsa_pss_params_30_fromdata() now uses the OSSL_PKEY_PARAM_RSA_DIGEST_PROPS parameter also.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12944)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/keymgmt/rsa_kmgmt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 659121c227..6bc666bcf0 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -193,7 +193,7 @@ static int rsa_export(void *keydata, int selection, if ((selection & OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS) != 0) ok = ok && (rsa_pss_params_30_is_unrestricted(pss_params) - || rsa_pss_params_30_todata(pss_params, NULL, tmpl, NULL)); + || rsa_pss_params_30_todata(pss_params, tmpl, NULL)); if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) ok = ok && rsa_todata(rsa, tmpl, NULL); @@ -339,7 +339,7 @@ static int rsa_get_params(void *key, OSSL_PARAM params[]) } } return (rsa_type != RSA_FLAG_TYPE_RSASSAPSS - || rsa_pss_params_30_todata(pss_params, NULL, NULL, params)) + || rsa_pss_params_30_todata(pss_params, NULL, params)) && rsa_todata(rsa, NULL, params); } @@ -383,6 +383,7 @@ static int rsa_validate(void *keydata, int selection) struct rsa_gen_ctx { OPENSSL_CTX *libctx; + const char *propq; int rsa_type; @@ -493,6 +494,7 @@ static int rsa_gen_set_params(void *genctx, const OSSL_PARAM params[]) */ #define rsa_gen_pss \ OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST, NULL, 0), \ + OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, NULL, 0), \ OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MASKGENFUNC, NULL, 0), \ OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MGF1_DIGEST, NULL, 0), \ OSSL_PARAM_int(OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, NULL) |