diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-25 09:08:54 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 9500c8234d8e99396717b9e43f10cc518e8bf668 (patch) | |
| tree | 51975e210b7900643c21d2ad67b3a65a902fc591 /crypto/rsa | |
| parent | e4bec869104cf4ba51cbb1effb0f5437e327ecd8 (diff) | |
Fix misc external ossl_ symbols.
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_lib.c | 4 | ||||
| -rw-r--r-- | crypto/rsa/rsa_sp800_56b_gen.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 530fdaa035..dfc74ec951 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -309,7 +309,7 @@ static uint32_t ilog_e(uint64_t v) * \cdot(log_e(nBits \cdot log_e(2))^{2/3} - 4.69}{log_e(2)} * The two cube roots are merged together here. */ -uint16_t ifc_ffc_compute_security_bits(int n) +uint16_t ossl_ifc_ffc_compute_security_bits(int n) { uint64_t x; uint32_t lx; @@ -361,7 +361,7 @@ int RSA_security_bits(const RSA *rsa) return 0; } #endif - return ifc_ffc_compute_security_bits(bits); + return ossl_ifc_ffc_compute_security_bits(bits); } int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c index 63cd9afc2f..077c32f1e9 100644 --- a/crypto/rsa/rsa_sp800_56b_gen.c +++ b/crypto/rsa/rsa_sp800_56b_gen.c @@ -171,7 +171,8 @@ err: */ int ossl_rsa_sp800_56b_validate_strength(int nbits, int strength) { - int s = (int)ifc_ffc_compute_security_bits(nbits); + int s = (int)ossl_ifc_ffc_compute_security_bits(nbits); + #ifdef FIPS_MODULE if (s < RSA_FIPS1864_MIN_KEYGEN_STRENGTH || s > RSA_FIPS1864_MAX_KEYGEN_STRENGTH) { |