diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-31 23:28:45 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-06 12:07:53 +0000 |
| commit | 5ce87e11de21835255ea11cc330ebf9931e21329 (patch) | |
| tree | 95b488894f32a0c964d83f1ccec645227f124820 /crypto/bn | |
| parent | 9aa78c36ec3bdcf09742f6dea403fc09d40d420f (diff) | |
| download | openssl-5ce87e11de21835255ea11cc330ebf9931e21329.zip openssl-5ce87e11de21835255ea11cc330ebf9931e21329.tar.gz openssl-5ce87e11de21835255ea11cc330ebf9931e21329.tar.bz2 | |
Fix builds with no-dh
The various functions in bn_const.c return primes that are
specified for use in DH. However they were not being excluded from
a no-dh build - and was therefore causing the build to fail.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10990)
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/build.info | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/bn/build.info b/crypto/bn/build.info index 5ad8bf1..bc3fb9b 100644 --- a/crypto/bn/build.info +++ b/crypto/bn/build.info @@ -101,12 +101,18 @@ 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_const.c bn_x931p.c bn_intern.c bn_dh.c \ - bn_rsa_fips186_4.c $BNASM + bn_x931p.c bn_intern.c bn_dh.c \ + bn_rsa_fips186_4.c $BNDH $BNASM SOURCE[../../libcrypto]=$COMMON bn_print.c bn_err.c bn_depr.c bn_srp.c SOURCE[../../providers/libfips.a]=$COMMON # Implementations are now spread across several libraries, so the defines |