diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-19 19:15:41 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2021-02-26 10:32:22 +1000 |
commit | 94553e85b68af4513a8ee89cd2a0d4e044d75139 (patch) | |
tree | 2150abcbe848f0d1973b0186bd6864595e3f18a2 /include | |
parent | 2d968951227acd422f0e712035de3216d47fc980 (diff) |
Fix external symbols for bn
Partial fix for #12964
This adds ossl_ names for symbols related to bn_*
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14296)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/bn.h | 31 | ||||
-rw-r--r-- | include/crypto/bn_dh.h | 52 |
2 files changed, 41 insertions, 42 deletions
diff --git a/include/crypto/bn.h b/include/crypto/bn.h index eb42ccd0f5..cf69bea848 100644 --- a/include/crypto/bn.h +++ b/include/crypto/bn.h @@ -93,26 +93,25 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, #define BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME 2 #define BN_PRIMETEST_PROBABLY_PRIME 3 -int bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx, - BN_GENCB *cb, int enhanced, int *status); +int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx, + BN_GENCB *cb, int enhanced, int *status); -const BIGNUM *bn_get0_small_factors(void); +const BIGNUM *ossl_bn_get0_small_factors(void); -int bn_rsa_fips186_4_prime_MR_min_checks(int nbits); +int ossl_bn_rsa_fips186_4_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout, + BIGNUM *p1, BIGNUM *p2, + const BIGNUM *Xp, const BIGNUM *Xp1, + const BIGNUM *Xp2, int nlen, + const BIGNUM *e, BN_CTX *ctx, + BN_GENCB *cb); -int bn_rsa_fips186_4_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout, - BIGNUM *p1, BIGNUM *p2, - const BIGNUM *Xp, const BIGNUM *Xp1, - const BIGNUM *Xp2, int nlen, - const BIGNUM *e, BN_CTX *ctx, - BN_GENCB *cb); +int ossl_bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin, + const BIGNUM *r1, const BIGNUM *r2, + int nlen, const BIGNUM *e, BN_CTX *ctx, + BN_GENCB *cb); -int bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin, - const BIGNUM *r1, const BIGNUM *r2, int nlen, - const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb); +OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx); -OSSL_LIB_CTX *bn_get_libctx(BN_CTX *ctx); - -extern const BIGNUM bn_inv_sqrt_2; +extern const BIGNUM ossl_bn_inv_sqrt_2; #endif diff --git a/include/crypto/bn_dh.h b/include/crypto/bn_dh.h index b900c36651..e0506b753e 100644 --- a/include/crypto/bn_dh.h +++ b/include/crypto/bn_dh.h @@ -8,36 +8,36 @@ */ #define declare_dh_bn(x) \ - extern const BIGNUM _bignum_dh##x##_p; \ - extern const BIGNUM _bignum_dh##x##_q; \ - extern const BIGNUM _bignum_dh##x##_g; \ + extern const BIGNUM ossl_bignum_dh##x##_p; \ + extern const BIGNUM ossl_bignum_dh##x##_q; \ + extern const BIGNUM ossl_bignum_dh##x##_g; \ declare_dh_bn(1024_160) declare_dh_bn(2048_224) declare_dh_bn(2048_256) -extern const BIGNUM _bignum_const_2; +extern const BIGNUM ossl_bignum_const_2; -extern const BIGNUM _bignum_ffdhe2048_p; -extern const BIGNUM _bignum_ffdhe3072_p; -extern const BIGNUM _bignum_ffdhe4096_p; -extern const BIGNUM _bignum_ffdhe6144_p; -extern const BIGNUM _bignum_ffdhe8192_p; -extern const BIGNUM _bignum_ffdhe2048_q; -extern const BIGNUM _bignum_ffdhe3072_q; -extern const BIGNUM _bignum_ffdhe4096_q; -extern const BIGNUM _bignum_ffdhe6144_q; -extern const BIGNUM _bignum_ffdhe8192_q; +extern const BIGNUM ossl_bignum_ffdhe2048_p; +extern const BIGNUM ossl_bignum_ffdhe3072_p; +extern const BIGNUM ossl_bignum_ffdhe4096_p; +extern const BIGNUM ossl_bignum_ffdhe6144_p; +extern const BIGNUM ossl_bignum_ffdhe8192_p; +extern const BIGNUM ossl_bignum_ffdhe2048_q; +extern const BIGNUM ossl_bignum_ffdhe3072_q; +extern const BIGNUM ossl_bignum_ffdhe4096_q; +extern const BIGNUM ossl_bignum_ffdhe6144_q; +extern const BIGNUM ossl_bignum_ffdhe8192_q; -extern const BIGNUM _bignum_modp_1536_p; -extern const BIGNUM _bignum_modp_2048_p; -extern const BIGNUM _bignum_modp_3072_p; -extern const BIGNUM _bignum_modp_4096_p; -extern const BIGNUM _bignum_modp_6144_p; -extern const BIGNUM _bignum_modp_8192_p; -extern const BIGNUM _bignum_modp_1536_q; -extern const BIGNUM _bignum_modp_2048_q; -extern const BIGNUM _bignum_modp_3072_q; -extern const BIGNUM _bignum_modp_4096_q; -extern const BIGNUM _bignum_modp_6144_q; -extern const BIGNUM _bignum_modp_8192_q; +extern const BIGNUM ossl_bignum_modp_1536_p; +extern const BIGNUM ossl_bignum_modp_2048_p; +extern const BIGNUM ossl_bignum_modp_3072_p; +extern const BIGNUM ossl_bignum_modp_4096_p; +extern const BIGNUM ossl_bignum_modp_6144_p; +extern const BIGNUM ossl_bignum_modp_8192_p; +extern const BIGNUM ossl_bignum_modp_1536_q; +extern const BIGNUM ossl_bignum_modp_2048_q; +extern const BIGNUM ossl_bignum_modp_3072_q; +extern const BIGNUM ossl_bignum_modp_4096_q; +extern const BIGNUM ossl_bignum_modp_6144_q; +extern const BIGNUM ossl_bignum_modp_8192_q; |