diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-02-23 13:37:06 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-02-24 14:12:48 +0100 |
| commit | 11a9eacde99f6333707b2399054d66ebbc0eb2a9 (patch) | |
| tree | 584520a02c884be62ac543e819a13c3a47373888 /crypto/poly1305 | |
| parent | ae1ffe0f65c460ccdfe5153b96fe9943d7a171b8 (diff) | |
{ec/curve25519,poly1305/poly1305}.c: relax pedantic constraint.
As it turns out gcc -pedantic doesn't seem to consider __uint128_t
as non-standard, unlike __int128 that is.
Fix even MSVC warnings in curve25519.c.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5449)
Diffstat (limited to 'crypto/poly1305')
| -rw-r--r-- | crypto/poly1305/poly1305.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c index ab4fa83c24..7615e339b1 100644 --- a/crypto/poly1305/poly1305.c +++ b/crypto/poly1305/poly1305.c @@ -95,12 +95,11 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit); (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1) \ ) -# if !defined(PEDANTIC) && \ - (defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16) && \ +# if (defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16) && \ (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__==8) typedef unsigned long u64; -typedef unsigned __int128 u128; +typedef __uint128_t u128; typedef struct { u64 h[3]; |