diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-16 21:39:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-20 12:59:31 +0000 |
| commit | dd8796c551f236ee89a1b9068247c428ae818f21 (patch) | |
| tree | befce7af913b1bba71b204672b686463de433f93 /crypto | |
| parent | a4e6dd819a1c395fb8e884c5a8f29ed0551ec13e (diff) | |
Some more cleanups of curve448 code
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec/curve448/curve448utils.h | 3 | ||||
| -rw-r--r-- | crypto/ec/curve448/word.h | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h index 95b8c26da8..4af2c3f12d 100644 --- a/crypto/ec/curve448/curve448utils.h +++ b/crypto/ec/curve448/curve448utils.h @@ -23,8 +23,7 @@ * with arch_arm32. */ # ifndef C448_WORD_BITS -# if (defined(__ILP64__) || defined(__amd64__) || defined(__x86_64__) \ - || (((__UINT_FAST32_MAX__)>>30)>>30)) +# if defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16) # define C448_WORD_BITS 64 /* The number of bits in a word */ # else # define C448_WORD_BITS 32 /* The number of bits in a word */ diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h index c739b70d51..a48b9e053a 100644 --- a/crypto/ec/curve448/word.h +++ b/crypto/ec/curve448/word.h @@ -20,17 +20,6 @@ # include "arch_intrinsics.h" # include "curve448utils.h" -# if defined(__ARM_NEON__) -# include <arm_neon.h> -# elif defined(__SSE2__) -# if !defined(__GNUC__) || defined(__clang__) || __GNUC__ >= 5 \ - || (__GNUC__==4 && __GNUC_MINOR__ >= 4) -# include <immintrin.h> -# else -# include <emmintrin.h> -# endif -# endif - # if (ARCH_WORD_BITS == 64) typedef uint64_t word_t, mask_t; typedef __uint128_t dword_t; |