diff options
| author | David Benjamin <davidben@chromium.org> | 2015-11-14 19:57:11 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-11-17 02:18:00 +0300 |
| commit | 2077cf915283d6a2292d6114f131dd5af124b1b0 (patch) | |
| tree | 072e2269928d1eb6903f6db0e942e705cff02c86 /crypto/modes | |
| parent | af07365b498b4cf183493a86dcfd768b3a5e8eaa (diff) | |
Use UINT64_C instead of OPENSSL_U64.
stdint.h already has macros for this. The spec says that, in C++,
__STDC_CONSTANT_MACROS is needed, so define it for bytestring_test.cc.
Chromium seems to use these macros without trouble, so I'm assuming we
can rely on them.
Change-Id: I56d178689b44d22c6379911bbb93d3b01dd832a3
Reviewed-on: https://boringssl-review.googlesource.com/6510
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/modes')
| -rw-r--r-- | crypto/modes/gcm.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c index 8aac741a..65451a6c 100644 --- a/crypto/modes/gcm.c +++ b/crypto/modes/gcm.c @@ -55,7 +55,6 @@ #include <openssl/cpu.h> #include "internal.h" -#include "../internal.h" #if !defined(OPENSSL_NO_ASM) && \ @@ -76,7 +75,7 @@ #define REDUCE1BIT(V) \ do { \ if (sizeof(size_t) == 8) { \ - uint64_t T = OPENSSL_U64(0xe100000000000000) & (0 - (V.lo & 1)); \ + uint64_t T = UINT64_C(0xe100000000000000) & (0 - (V.lo & 1)); \ V.lo = (V.hi << 63) | (V.lo >> 1); \ V.hi = (V.hi >> 1) ^ T; \ } else { \ @@ -586,7 +585,7 @@ int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const uint8_t *aad, size_t len) { } alen += len; - if (alen > (OPENSSL_U64(1) << 61) || (sizeof(len) == 8 && alen < len)) { + if (alen > (UINT64_C(1) << 61) || (sizeof(len) == 8 && alen < len)) { return 0; } ctx->len.u[0] = alen; @@ -653,7 +652,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx, const void *key, #endif mlen += len; - if (mlen > ((OPENSSL_U64(1) << 36) - 32) || + if (mlen > ((UINT64_C(1) << 36) - 32) || (sizeof(len) == 8 && mlen < len)) { return 0; } @@ -813,7 +812,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx, const void *key, #endif mlen += len; - if (mlen > ((OPENSSL_U64(1) << 36) - 32) || + if (mlen > ((UINT64_C(1) << 36) - 32) || (sizeof(len) == 8 && mlen < len)) { return 0; } @@ -978,7 +977,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx, const void *key, #endif mlen += len; - if (mlen > ((OPENSSL_U64(1) << 36) - 32) || + if (mlen > ((UINT64_C(1) << 36) - 32) || (sizeof(len) == 8 && mlen < len)) { return 0; } @@ -1087,7 +1086,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx, const void *key, #endif mlen += len; - if (mlen > ((OPENSSL_U64(1) << 36) - 32) || + if (mlen > ((UINT64_C(1) << 36) - 32) || (sizeof(len) == 8 && mlen < len)) { return 0; } |