diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-16 16:35:44 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-18 14:14:52 +0000 |
| commit | 13c453728c076d5c1a65a5fd9424e15a9964d755 (patch) | |
| tree | 2adfcc10718f85bab39f1ffcbdb5dff63efe6b69 /crypto/bn | |
| parent | 163f6dc1f70f30de46a68137c36e70cae4d95cd8 (diff) | |
Only disabled what we need to in a no-dh build
no-dh disables the low level API for DH. However, since we're now using
the high level EVP API in most places we don't need to disable quite so
much.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13368)
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn_dh.c | 3 | ||||
| -rw-r--r-- | crypto/bn/build.info | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 74ce024004..9f5b80cb8e 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -10,7 +10,6 @@ #include "bn_local.h" #include "internal/nelem.h" -#ifndef OPENSSL_NO_DH # include <openssl/dh.h> # include "crypto/bn_dh.h" @@ -1051,5 +1050,3 @@ make_dh_bn(modp_6144_p) make_dh_bn(modp_6144_q) make_dh_bn(modp_8192_p) make_dh_bn(modp_8192_q) - -#endif /* OPENSSL_NO_DH */ diff --git a/crypto/bn/build.info b/crypto/bn/build.info index 093cbcc7f1..6164bba8c7 100644 --- a/crypto/bn/build.info +++ b/crypto/bn/build.info @@ -101,18 +101,12 @@ IF[{- !$disabled{asm} -}] ENDIF ENDIF -IF[{- !$disabled{dh} -}] - $BNDH=bn_const.c -ELSE - $BNDH= -ENDIF - $COMMON=bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c \ bn_mod.c bn_conv.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \ bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_sqr.c \ bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \ bn_x931p.c bn_intern.c bn_dh.c \ - bn_rsa_fips186_4.c $BNDH + bn_rsa_fips186_4.c bn_const.c SOURCE[../../libcrypto]=$COMMON $BNASM bn_print.c bn_err.c bn_srp.c IF[{- !$disabled{'deprecated-3.0'} -}] SOURCE[../../libcrypto]=bn_depr.c |