diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-04-08 15:22:18 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-04-11 08:42:10 +1000 |
| commit | dbd233b8038a0daba891335548d95a0d6f26807d (patch) | |
| tree | aec7424df9edbf2181df8b20ece0ef4ec9e8bc89 /crypto | |
| parent | d8ceb246079a929461c0193255c8309348a0614c (diff) | |
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)
(cherry picked from commit 3a86f1db282569c538273cc48462a3fa5fcffa39)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec/curve25519.c | 3 | ||||
| -rw-r--r-- | crypto/ec/curve448/curve448utils.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c index aa999cc591..c5d887ec4c 100644 --- a/crypto/ec/curve25519.c +++ b/crypto/ec/curve25519.c @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (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 diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h index 9bf837993c..9032bb4f73 100644 --- a/crypto/ec/curve448/curve448utils.h +++ b/crypto/ec/curve448/curve448utils.h @@ -1,5 +1,5 @@ /* - * 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 OpenSSL license (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 */ |