commit 11676a7399555d7ab3e421b19e9016d170d639e0
author Brian Smith <brian@briansmith.org> Sun Feb 07 11:25:23 2016 -1000
committer David Benjamin <davidben@google.com> Thu Feb 11 22:08:42 2016 +0000
tree 74e1f2246d5b97228c9b45d7cf5caa43547dc210
parent 5ba06897be4fb001113f6e8ea2398538dbbb88f2

Use |kSizeTWithoutLower4Bits| in crypto/modes/gcm.c.

Some instances were missed in eca509c8daf998a6eb84f32a85c2f3137d692e55.

Change-Id: I53a6bd944fbf0df439b8e6f9db761f61d7237ba2
Reviewed-on: https://boringssl-review.googlesource.com/7103
Reviewed-by: David Benjamin <davidben@google.com>

crypto/modes/gcm.c

diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c
index 2519b19..8cc138d 100644
--- a/crypto/modes/gcm.c
+++ b/crypto/modes/gcm.c
@@ -606,7 +606,8 @@
   }
 
 #ifdef GHASH
-  if ((i = (len & (size_t) - 16))) {
+  i = len & kSizeTWithoutLower4Bits;
+  if (i != 0) {
     GHASH(ctx, aad, i);
     aad += i;
     len -= i;
@@ -895,7 +896,8 @@
     }
     len -= GHASH_CHUNK;
   }
-  if ((i = (len & (size_t) - 16))) {
+  i = len & kSizeTWithoutLower4Bits;
+  if (i != 0) {
     GHASH(ctx, in, i);
     while (len >= 16) {
       size_t *out_t = (size_t *)out;