diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-05-22 15:08:38 +0200 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-06-01 10:02:28 +1000 |
| commit | 3410a72dce57651e08d5d2143409cde0205a8f3b (patch) | |
| tree | 4083fb33e5c9a6f21ebcb276e405da5fab7da6a8 /crypto/cms/cms_rsa.c | |
| parent | 09bd0d05a6ab9eb4965763c100edf9b86ae03d2b (diff) | |
Compute RSA-PSS algorithm params in libcrypto for legacy
Fixes regression of RSA signatures for legacy keys caused
by quering the provider for the algorithm id with parameters.
Legacy keys do not have a method that would create the
algorithm id. So we revert to what was done in 3.0.7 and
earlier versions for these keys.
Fixes #21008
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21019)
Diffstat (limited to 'crypto/cms/cms_rsa.c')
| -rw-r--r-- | crypto/cms/cms_rsa.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/crypto/cms/cms_rsa.c b/crypto/cms/cms_rsa.c index e997e6eec1..4e0712f94c 100644 --- a/crypto/cms/cms_rsa.c +++ b/crypto/cms/cms_rsa.c @@ -13,6 +13,7 @@ #include <openssl/core_names.h> #include "crypto/asn1.h" #include "crypto/rsa.h" +#include "crypto/evp.h" #include "cms_local.h" static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg) @@ -209,6 +210,16 @@ static int rsa_cms_sign(CMS_SignerInfo *si) if (pad_mode != RSA_PKCS1_PSS_PADDING) return 0; + if (evp_pkey_ctx_is_legacy(pkctx)) { + /* No provider -> we cannot query it for algorithm ID. */ + ASN1_STRING *os = NULL; + + os = ossl_rsa_ctx_to_pss_string(pkctx); + if (os == NULL) + return 0; + return X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_PKEY_RSA_PSS), V_ASN1_SEQUENCE, os); + } + params[0] = OSSL_PARAM_construct_octet_string( OSSL_SIGNATURE_PARAM_ALGORITHM_ID, aid, sizeof(aid)); params[1] = OSSL_PARAM_construct_end(); |