commit 4a2bd0da0fac1ee6d596a35bfcaf4031905898fa
author Paul Bakker <p.j.bakker@polarssl.org> Fri Nov 02 11:06:08 2012 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Fri Nov 02 11:06:08 2012 +0000
tree 9de7f87f5b6061580a567a00567a20b25feca0e9
parent b624520762a29f8e2279bb359c1344424a392d4f

 - Merged fixes 1394 and 1395 from trunk to PolarSSL 1.2 branch

library/gcm.c

diff --git a/library/gcm.c b/library/gcm.c
index 3faaa5d..c91598c 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -148,7 +148,7 @@
 
         if( i != 15 )
         {
-            rem = zl & 0xf;
+            rem = (unsigned char) zl & 0xf;
             zl = ( zh << 60 ) | ( zl >> 4 );
             zh = ( zh >> 4 );
             zh ^= (uint64_t) last4[rem] << 48;
@@ -157,7 +157,7 @@
 
         }
 
-        rem = zl & 0xf;
+        rem = (unsigned char) zl & 0xf;
         zl = ( zh << 60 ) | ( zl >> 4 );
         zh = ( zh >> 4 );
         zh ^= (uint64_t) last4[rem] << 48;