diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-03-05 12:50:31 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-16 13:52:22 +0200 |
| commit | 705536e2b5c4167dbda2e0046d83f9e0f4a65514 (patch) | |
| tree | 5b76e00908f3d8c5dcbb75f094a4c06d989e97d5 /crypto/ec/ecp_nistp224.c | |
| parent | 7165593ce5a07a6860d4d408ad640ee707172936 (diff) | |
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/ec/ecp_nistp224.c')
| -rw-r--r-- | crypto/ec/ecp_nistp224.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c index f52e55b7ed..bf8e5db614 100644 --- a/crypto/ec/ecp_nistp224.c +++ b/crypto/ec/ecp_nistp224.c @@ -37,22 +37,19 @@ */ #include <openssl/opensslconf.h> -#ifdef OPENSSL_NO_EC_NISTP_64_GCC_128 -NON_EMPTY_TRANSLATION_UNIT -#else -# include <stdint.h> -# include <string.h> -# include <openssl/err.h> -# include "ec_local.h" +#include <stdint.h> +#include <string.h> +#include <openssl/err.h> +#include "ec_local.h" -# if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 +#if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 /* even with gcc, the typedef won't work for 32-bit platforms */ typedef __uint128_t uint128_t; /* nonstandard; implemented by gcc on 64-bit * platforms */ -# else -# error "Your compiler doesn't appear to support 128-bit integer types" -# endif +#else +# error "Your compiler doesn't appear to support 128-bit integer types" +#endif typedef uint8_t u8; typedef uint64_t u64; @@ -1755,5 +1752,3 @@ int ec_GFp_nistp224_have_precompute_mult(const EC_GROUP *group) { return HAVEPRECOMP(group, nistp224); } - -#endif |