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 /include | |
| parent | 81777339e9ed62cd3b801bf225fa1f2aba4b30dd (diff) | |
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 'include')
| -rw-r--r-- | include/crypto/rsa.h | 2 | ||||
| -rw-r--r-- | include/openssl/core_names.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h index 478327d231..278e215062 100644 --- a/include/crypto/rsa.h +++ b/include/crypto/rsa.h @@ -60,7 +60,7 @@ int rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes, int rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); int rsa_fromdata(RSA *rsa, const OSSL_PARAM params[]); -int rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss, const char *propq, +int rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]); int rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params, const OSSL_PARAM params[], OPENSSL_CTX *libctx); diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index a1c73a86df..76902695f0 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -379,6 +379,7 @@ extern "C" { #define OSSL_PKEY_PARAM_RSA_BITS OSSL_PKEY_PARAM_BITS #define OSSL_PKEY_PARAM_RSA_PRIMES "primes" #define OSSL_PKEY_PARAM_RSA_DIGEST OSSL_PKEY_PARAM_DIGEST +#define OSSL_PKEY_PARAM_RSA_DIGEST_PROPS OSSL_PKEY_PARAM_PROPERTIES #define OSSL_PKEY_PARAM_RSA_MASKGENFUNC OSSL_PKEY_PARAM_MASKGENFUNC #define OSSL_PKEY_PARAM_RSA_MGF1_DIGEST OSSL_PKEY_PARAM_MGF1_DIGEST #define OSSL_PKEY_PARAM_RSA_PSS_SALTLEN "saltlen" |