GCM updates from bc-java

Author: peterdettman

crypto/BouncyCastle.Android.csproj

@@ -912,6 +912,7 @@
     <Compile Include="src\crypto\modes\gcm\IGcmExponentiator.cs" />
     <Compile Include="src\crypto\modes\gcm\IGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables1kGcmExponentiator.cs" />
+    <Compile Include="src\crypto\modes\gcm\Tables4kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables64kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables8kGcmMultiplier.cs" />
     <Compile Include="src\crypto\operators\Asn1CipherBuilder.cs" />

crypto/BouncyCastle.csproj

@@ -906,6 +906,7 @@
     <Compile Include="src\crypto\modes\gcm\IGcmExponentiator.cs" />
     <Compile Include="src\crypto\modes\gcm\IGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables1kGcmExponentiator.cs" />
+    <Compile Include="src\crypto\modes\gcm\Tables4kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables64kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables8kGcmMultiplier.cs" />
     <Compile Include="src\crypto\operators\Asn1CipherBuilder.cs" />

crypto/BouncyCastle.iOS.csproj

@@ -907,6 +907,7 @@
     <Compile Include="src\crypto\modes\gcm\IGcmExponentiator.cs" />
     <Compile Include="src\crypto\modes\gcm\IGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables1kGcmExponentiator.cs" />
+    <Compile Include="src\crypto\modes\gcm\Tables4kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables64kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables8kGcmMultiplier.cs" />
     <Compile Include="src\crypto\operators\Asn1CipherBuilder.cs" />

crypto/crypto.csproj

@@ -4413,6 +4413,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "src\crypto\modes\gcm\Tables4kGcmMultiplier.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "src\crypto\modes\gcm\Tables64kGcmMultiplier.cs"
                     SubType = "Code"

crypto/src/crypto/modes/GCMBlockCipher.cs

@@ -59,8 +59,7 @@ public GcmBlockCipher(
 
             if (m == null)
             {
-                // TODO Consider a static property specifying default multiplier
-                m = new Tables8kGcmMultiplier();
+                m = new Tables4kGcmMultiplier();
             }
 
             this.cipher = c;
@@ -444,7 +443,7 @@ public int DoFinal(byte[] output, int outOff)
                 byte[] H_c = new byte[16];
                 if (exp == null)
                 {
-                    exp = new Tables1kGcmExponentiator();
+                    exp = new BasicGcmExponentiator();
                     exp.Init(H);
                 }
                 exp.ExponentiateX(c, H_c);

crypto/src/crypto/modes/gcm/BasicGcmExponentiator.cs

@@ -7,28 +7,28 @@ namespace Org.BouncyCastle.Crypto.Modes.Gcm
     public class BasicGcmExponentiator
         : IGcmExponentiator
     {
-        private uint[] x;
+        private ulong[] x;
 
         public void Init(byte[] x)
         {
-            this.x = GcmUtilities.AsUints(x);
+            this.x = GcmUtilities.AsUlongs(x);
         }
 
         public void ExponentiateX(long pow, byte[] output)
         {
             // Initial value is little-endian 1
-            uint[] y = GcmUtilities.OneAsUints();
+            ulong[] y = GcmUtilities.OneAsUlongs();
 
             if (pow > 0)
             {
-                uint[] powX = Arrays.Clone(x);
+                ulong[] powX = Arrays.Clone(x);
                 do
                 {
                     if ((pow & 1L) != 0)
                     {
                         GcmUtilities.Multiply(y, powX);
                     }
-                    GcmUtilities.Multiply(powX, powX);
+                    GcmUtilities.Square(powX, powX);
                     pow >>= 1;
                 }
                 while (pow > 0);

crypto/src/crypto/modes/gcm/BasicGcmMultiplier.cs

@@ -5,16 +5,16 @@ namespace Org.BouncyCastle.Crypto.Modes.Gcm
     public class BasicGcmMultiplier
         : IGcmMultiplier
     {
-        private uint[] H;
+        private ulong[] H;
 
         public void Init(byte[] H)
         {
-            this.H = GcmUtilities.AsUints(H);
+            this.H = GcmUtilities.AsUlongs(H);
         }
 
         public void MultiplyH(byte[] x)
         {
-            uint[] t = GcmUtilities.AsUints(x);
+            ulong[] t = GcmUtilities.AsUlongs(x);
             GcmUtilities.Multiply(t, H);
             GcmUtilities.AsBytes(t, x);
         }