Commit 3a86f1db authored Apr 08, 2019 by Shane Lontis Committed by Pauli Apr 11, 2019

Fixed linux_x86_icc compiler errors in EC code related to __uint128_t/__int128_t



Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8697)

parent 491360e7

crypto/ec/curve25519.c

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
		* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
		*
		* Licensed under the Apache License 2.0 (the "License"). You may not use
		* this file except in compliance with the License. You can obtain a copy
		@@ -254,6 +254,7 @@ static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
		#if defined(X25519_ASM) \
		\|\| ( (defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16) \
		&& !defined(__sparc__) \
		&& (!defined(__SIZEOF_LONG__) \|\| (__SIZEOF_LONG__ == 8)) \
		&& !(defined(__ANDROID__) && !defined(__clang__)) )
		/*
		* Base 2^51 implementation. It's virtually no different from reference

crypto/ec/curve448/curve448utils.h

+4 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.
		* Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved.
		* Copyright 2015 Cryptography Research, Inc.
		*
		* Licensed under the Apache License 2.0 (the "License"). You may not use
		@@ -24,7 +24,9 @@
		*/
		# ifndef C448_WORD_BITS
		# if (defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16)) \
		&& !defined(__sparc__)
		&& !defined(__sparc__) \
		&& (!defined(__SIZEOF_LONG__) \|\| (__SIZEOF_LONG__ == 8))

		# 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 */