Commit dd8796c5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Some more cleanups of curve448 code 



Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
parent a4e6dd81

crypto/ec/curve448/curve448utils.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */

crypto/ec/curve448/word.h

+0 −11
Original line number Diff line number Diff line
@@ -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;