diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-03-05 18:50:31 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-16 13:52:22 +0200 |
| commit | 705536e2b5c4167dbda2e0046d83f9e0f4a65514 (patch) | |
| tree | 5b76e00908f3d8c5dcbb75f094a4c06d989e97d5 /crypto/aes | |
| parent | Add DH keygen to providers (diff) | |
| download | openssl-705536e2b5c4167dbda2e0046d83f9e0f4a65514.tar.xz openssl-705536e2b5c4167dbda2e0046d83f9e0f4a65514.zip | |
Use build.info, not ifdef for crypto modules
Don't wrap conditionally-compiled files in global ifndef tests.
Instead, test if the feature is disabled and, if so, do not
compile it.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11263)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/aes_ige.c | 5 | ||||
| -rw-r--r-- | crypto/aes/build.info | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c index b40f4e53a6..6e72d2f7f4 100644 --- a/crypto/aes/aes_ige.c +++ b/crypto/aes/aes_ige.c @@ -15,10 +15,6 @@ #include "internal/cryptlib.h" -#ifdef OPENSSL_NO_DEPRECATED_3_0 -NON_EMPTY_TRANSLATION_UNIT -#else - #include <openssl/aes.h> #include "aes_local.h" @@ -301,4 +297,3 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, } } } -#endif diff --git a/crypto/aes/build.info b/crypto/aes/build.info index dc00df0cda..2b2053031f 100644 --- a/crypto/aes/build.info +++ b/crypto/aes/build.info @@ -60,7 +60,10 @@ IF[{- !$disabled{asm} -}] ENDIF $COMMON=aes_misc.c aes_ecb.c $AESASM -SOURCE[../../libcrypto]=$COMMON aes_cfb.c aes_ofb.c aes_ige.c aes_wrap.c +SOURCE[../../libcrypto]=$COMMON aes_cfb.c aes_ofb.c aes_wrap.c +IF[{- !$disabled{'deprecated-3.0'} -}] + SOURCE[../../libcrypto]=aes_ige.c +ENDIF SOURCE[../../providers/libfips.a]=$COMMON # Implementations are now spread across several libraries, so the defines |