yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL eca509c: Clarify confusing conditionals in crypto/gcm/gcm.c.

Browse Source 
This is BoringSSL's modified version of *ring*'s
7f865ff3072b2a89e30fdd9f795fcceaefd34595.
This commit is contained in:
Brian Smith 2015-10-27 20:05:35 -10:00
commit ea6132c7d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/modes/gcm.c
View File

@ -86,6 +86,9 @@
} \
} while (0)
// kSizeTWithoutLower4Bits is a mask that can be used to zero the lower four
// bits of a |size_t|.
static const size_t kSizeTWithoutLower4Bits = (size_t) -16;
static void gcm_init_4bit(u128 Htable[16], uint64_t H[2]) {
u128 V;
@ -974,7 +977,7 @@ int CRYPTO_gcm128_encrypt_ctr32_sk(GCM128_CONTEXT_SK *ctx, const void *key,
len -= GHASH_CHUNK;
}
#endif
size_t i = len & (size_t)-16; /* i = len, less the remainder modulo 16. */
size_t i = len & kSizeTWithoutLower4Bits;
if (i != 0) {
size_t j = i / 16;
@ -1085,7 +1088,7 @@ int CRYPTO_gcm128_decrypt_ctr32_sk(GCM128_CONTEXT_SK *ctx, const void *key,
len -= GHASH_CHUNK;
}
#endif
size_t i = len & (size_t)-16; /* i = len, less the remainder modulo 16. */
size_t i = len & kSizeTWithoutLower4Bits;
if (i != 0) {
size_t j = i / 16;