diff options
-rw-r--r-- | crypto/ec/curve448/curve448.c | 3 | ||||
-rw-r--r-- | crypto/ec/curve448/word.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c index f34dfcce6c..1459976981 100644 --- a/crypto/ec/curve448/curve448.c +++ b/crypto/ec/curve448/curve448.c @@ -22,7 +22,8 @@ #define C448_WNAF_FIXED_TABLE_BITS 5 #define C448_WNAF_VAR_TABLE_BITS 3 -static const int EDWARDS_D = -39081; +#define EDWARDS_D (-39081) + static const curve448_scalar_t precomputed_scalarmul_adjustment = { { { diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h index 01c9779938..179d70b853 100644 --- a/crypto/ec/curve448/word.h +++ b/crypto/ec/curve448/word.h @@ -14,13 +14,11 @@ # define HEADER_WORD_H # include <string.h> - # include <assert.h> +# include <stdlib.h> # include <openssl/e_os2.h> # include "arch_intrinsics.h" - # include "curve448utils.h" -# include <stdlib.h> # if defined(__ARM_NEON__) # include <arm_neon.h> @@ -56,7 +54,7 @@ typedef int64_t dsword_t; # if C448_WORD_BITS == 64 # define SC_LIMB(x) (x) # elif C448_WORD_BITS == 32 -# define SC_LIMB(x) ((uint32_t)x),(x >> 32) +# define SC_LIMB(x) ((uint32_t)(x)),((x) >> 32) # else # error "For now we only support 32- and 64-bit architectures." # endif |