diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-31 13:08:23 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-09 20:13:29 -0500 |
| commit | effaf4dee90beff07bb40f21d81352304a5e8152 (patch) | |
| tree | 4bc77d1b1998e6fac62b3a5967a223376cb47111 /crypto/bn | |
| parent | 1ffa8a9685e22a5a0ff1b1322df4d1720b05ce4c (diff) | |
Use NON_EMPTY_TRANSLATION_UNIT, consistently.
This also closes RT 4123
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn_depr.c | 15 | ||||
| -rw-r--r-- | crypto/bn/rsaz_exp.c | 10 |
2 files changed, 11 insertions, 14 deletions
diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c index 9e6b08f72c..debed8dc83 100644 --- a/crypto/bn/bn_depr.c +++ b/crypto/bn/bn_depr.c @@ -57,16 +57,17 @@ * slurp this code if applications are using them directly. */ -#include <stdio.h> -#include <time.h> -#include "internal/cryptlib.h" -#include "bn_lcl.h" #include <openssl/opensslconf.h> -#include <openssl/rand.h> +#if OPENSSL_API_COMPAT >= 0x00908000L +NON_EMPTY_TRANSLATION_UNIT +#else -static void *dummy = &dummy; +# include <stdio.h> +# include <time.h> +# include "internal/cryptlib.h" +# include "bn_lcl.h" +# include <openssl/rand.h> -#if OPENSSL_API_COMPAT < 0x00908000L BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe, const BIGNUM *add, const BIGNUM *rem, void (*callback) (int, int, void *), void *cb_arg) diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c index c54c6feb51..7fb70e4afd 100644 --- a/crypto/bn/rsaz_exp.c +++ b/crypto/bn/rsaz_exp.c @@ -42,7 +42,9 @@ #include "rsaz_exp.h" -#ifdef RSAZ_ENABLED +#ifndef RSAZ_ENABLED +NON_EMPTY_TRANSLATION_UNIT +#else /* * See crypto/bn/asm/rsaz-avx2.pl for further details. @@ -337,10 +339,4 @@ void RSAZ_512_mod_exp(BN_ULONG result[8], OPENSSL_cleanse(storage, sizeof(storage)); } -#else - -# if defined(PEDANTIC) || defined(__DECC) || defined(__clang__) -static void *dummy = &dummy; -# endif - #endif |