diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-10-06 12:23:42 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-10-06 12:30:47 -0400 |
| commit | 2d2846237364671670c4b9a8415ea957887e1797 (patch) | |
| tree | 4638d96264250b6104e5b156595814bb1a69a253 /crypto/bn/bn_dh.c | |
| parent | 20218b58b51b55189ada91807459d6bd64f5c986 (diff) | |
| download | openssl-new-2d2846237364671670c4b9a8415ea957887e1797.tar.gz | |
Fix travis builds on master
-Allow mingw debug builds to fail on Travis CI
-Fix Travis email notifications config
-Rename a variable to avoid a bogus warning with old GCC
error: declaration of ``dup'' shadows a global declaration [-Werror=shadow]
-Disable pedantic ms-format warnings with mingw
-Properly define const DH parameters
-Restore --debug flag in Travis CI builds; -d would get incorrectly passed
to ./Configure in mingw debug builds.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/bn/bn_dh.c')
| -rw-r--r-- | crypto/bn/bn_dh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 34f9fb0af8..5572a2de2b 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -248,7 +248,8 @@ static const BN_ULONG dh2048_256_q[] = { /* Macro to make a BIGNUM from static data */ -# define make_dh_bn(x) const BIGNUM _bignum_##x = { (BN_ULONG *) x, \ +# define make_dh_bn(x) extern const BIGNUM _bignum_##x; \ + const BIGNUM _bignum_##x = { (BN_ULONG *) x, \ OSSL_NELEM(x),\ OSSL_NELEM(x),\ 0, BN_FLG_STATIC_DATA }; |