Moved to 151b01, added extra example/test to AEADTest class.

dghgit · dghgit · commit 3688754ebe8a · 2014-01-01T14:53:28.000+11:00
diff --git a/bc-build.properties b/bc-build.properties
@@ -1,7 +1,7 @@
 
-release.suffix: 150
-release.name: 1.50
-release.debug: false
+release.suffix: 151b01
+release.name: 1.51b01
+release.debug: true
 
 mail.jar.home: /opt/javamail/mail.jar
 activation.jar.home: /opt/jaf/activation.jar
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -44,7 +44,7 @@
 public final class BouncyCastleProvider extends Provider
     implements ConfigurableProvider
 {
-    private static String info = "BouncyCastle Security Provider v1.50";
+    private static String info = "BouncyCastle Security Provider v1.51b";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -117,7 +117,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.50, info);
+        super(PROVIDER_NAME, 1.505, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {
diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/AEADTest.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/AEADTest.java
@@ -6,6 +6,7 @@
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.InvalidParameterSpecException;
 
@@ -55,6 +56,7 @@ public void performTest() throws Exception
             testGCMParameterSpec(K2, N2, A2, P2, C2);
             testGCMParameterSpecWithRepeatKey(K2, N2, A2, P2, C2);
             testGCMGeneric(KGCM, NGCM, new byte[0], new byte[0], CGCM);
+            testGCMParameterSpecWithMultipleUpdates(K2, N2, A2, P2, C2);
         }
         catch (ClassNotFoundException e)
         {
@@ -141,6 +143,62 @@ private void testGCMParameterSpec(byte[] K,
         }
     }
 
+    private void testGCMParameterSpecWithMultipleUpdates(byte[] K,
+                                      byte[] N,
+                                      byte[] A,
+                                      byte[] P,
+                                      byte[] C)
+        throws Exception
+    {
+        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
+        SecretKeySpec key = new SecretKeySpec(K, "AES");
+        SecureRandom random = new SecureRandom();
+
+        // GCMParameterSpec mapped to AEADParameters and overrides default MAC
+        // size
+        GCMParameterSpec spec = new GCMParameterSpec(128, N);
+
+        for (int i = 900; i != 1024; i++)
+        {
+            byte[] message = new byte[i];
+
+            random.nextBytes(message);
+
+            eax.init(Cipher.ENCRYPT_MODE, key, spec);
+
+            byte[] out = new byte[eax.getOutputSize(i)];
+
+            int offSet = 0;
+
+            int count;
+            for (count = 0; count < i / 21; count++)
+            {
+                offSet += eax.update(message, count * 21, 21, out, offSet);
+            }
+
+            offSet += eax.doFinal(message, count * 21, i - (count * 21), out, offSet);
+
+            byte[] dec = new byte[i];
+            int    len = offSet;
+
+            eax.init(Cipher.DECRYPT_MODE, key, spec);
+
+            offSet = 0;
+            for (count = 0; count < len / 10; count++)
+            {
+                offSet += eax.update(out, count * 10, 10, dec, offSet);
+            }
+
+            offSet += eax.doFinal(out, count * 10, len - (count * 10), dec, offSet);
+
+            if (!Arrays.areEqual(message, dec) || offSet != message.length)
+            {
+                fail("message mismatch");
+            }
+        }
+    }
+
+
     private void testGCMParameterSpecWithRepeatKey(byte[] K,
                                                    byte[] N,
                                                    byte[] A,

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`public final class BouncyCastleProvider extends Provider`
`45`	`45`	`implements ConfigurableProvider`
`46`	`46`	`{`
`47`		`- private static String info = "BouncyCastle Security Provider v1.50";`
	`47`	`+ private static String info = "BouncyCastle Security Provider v1.51b";`
`48`	`48`
`49`	`49`	`public static final String PROVIDER_NAME = "BC";`
`50`	`50`
`@@ -117,7 +117,7 @@ public final class BouncyCastleProvider extends Provider`
`117`	`117`	`*/`
`118`	`118`	`public BouncyCastleProvider()`
`119`	`119`	`{`
`120`		`- super(PROVIDER_NAME, 1.50, info);`
	`120`	`+ super(PROVIDER_NAME, 1.505, info);`
`121`	`121`
`122`	`122`	`AccessController.doPrivileged(new PrivilegedAction()`
`123`	`123`	`{`