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/evp | |
| 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/evp')
| -rw-r--r-- | crypto/evp/e_camellia.c | 11 | ||||
| -rw-r--r-- | crypto/evp/e_old.c | 3 | ||||
| -rw-r--r-- | crypto/evp/p_open.c | 13 |
3 files changed, 9 insertions, 18 deletions
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index 924df8d0ec..8ebd226762 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -53,7 +53,10 @@ */ #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_CAMELLIA +#ifdef OPENSSL_NO_CAMELLIA +NON_EMPTY_TRANSLATION_UNIT +#else + # include <openssl/evp.h> # include <openssl/err.h> # include <string.h> @@ -402,10 +405,4 @@ static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, BLOCK_CIPHER_generic_pack(NID_camellia, 128, 0) BLOCK_CIPHER_generic_pack(NID_camellia, 192, 0) BLOCK_CIPHER_generic_pack(NID_camellia, 256, 0) -#else - -# ifdef PEDANTIC -static void *dummy = &dummy; -# endif - #endif diff --git a/crypto/evp/e_old.c b/crypto/evp/e_old.c index 759856a8eb..c3185377dc 100644 --- a/crypto/evp/e_old.c +++ b/crypto/evp/e_old.c @@ -57,9 +57,8 @@ */ #include <openssl/opensslconf.h> - #if OPENSSL_API_COMPAT >= 0x00908000L -static void *dummy = &dummy; +NON_EMPTY_TRANSLATION_UNIT #else # include <openssl/evp.h> diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c index 41a721eea5..7f9c7337b2 100644 --- a/crypto/evp/p_open.c +++ b/crypto/evp/p_open.c @@ -55,11 +55,12 @@ * [including the GNU Public Licence.] */ -#include <stdio.h> #include "internal/cryptlib.h" +#ifdef OPENSSL_NO_RSA +NON_EMPTY_TRANSLATION_UNIT +#else -#ifndef OPENSSL_NO_RSA - +# include <stdio.h> # include <openssl/evp.h> # include <openssl/objects.h> # include <openssl/x509.h> @@ -117,10 +118,4 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL); return (i); } -#else /* !OPENSSL_NO_RSA */ - -# ifdef PEDANTIC -static void *dummy = &dummy; -# endif - #endif |