diff options
| author | Neil Horman <nhorman@openssl.org> | 2023-10-10 11:06:44 -0400 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-10-18 18:11:57 +0200 |
| commit | cfd5b0509ddaf2103a07ae9cc90d0750e4b5d852 (patch) | |
| tree | 65fe826b9bcfb881fca8cc4963afd4dd0476996d /crypto | |
| parent | cdfc6d4fa837191533ae0f6d2b420a75ee55df7e (diff) | |
Dont require CRT params on ossl_rsa_set0_all_params
Its not required that crt params be available in an RSA key, so don't
perform an error check on them
Fixes #29135
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22334)
(cherry picked from commit 2647726bd3ca63dc5f07ae3f10e16dff35d95626)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rsa/rsa_lib.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 709ecb5daa..acc8db4cb0 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -753,18 +753,22 @@ int ossl_rsa_set0_all_params(RSA *r, const STACK_OF(BIGNUM) *primes, return 0; pnum = sk_BIGNUM_num(primes); - if (pnum < 2 - || pnum != sk_BIGNUM_num(exps) - || pnum != sk_BIGNUM_num(coeffs) + 1) + if (pnum < 2) return 0; if (!RSA_set0_factors(r, sk_BIGNUM_value(primes, 0), - sk_BIGNUM_value(primes, 1)) - || !RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0), - sk_BIGNUM_value(exps, 1), - sk_BIGNUM_value(coeffs, 0))) + sk_BIGNUM_value(primes, 1))) return 0; + if (pnum == sk_BIGNUM_num(exps) + && pnum == sk_BIGNUM_num(coeffs) + 1) { + + if (!RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0), + sk_BIGNUM_value(exps, 1), + sk_BIGNUM_value(coeffs, 0))) + return 0; + } + #ifndef FIPS_MODULE old_infos = r->prime_infos; #endif |