Add test for DefaultMultiBlockCipher

Author: gefeili

prov/src/test/java/org/bouncycastle/jce/provider/test/BlockCipherTest.java

@@ -39,6 +39,7 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.DefaultMultiBlockCipher;
 import org.bouncycastle.crypto.engines.AESEngine;
 import org.bouncycastle.crypto.engines.DESEngine;
 import org.bouncycastle.crypto.paddings.PKCS7Padding;
@@ -1747,6 +1748,7 @@ public void performTest()
         testIncorrectCipherModes();
         doFinalTest();
         testOverlapping();
+        testOverlapping2();
     }
 
     private void doFinalTest()
@@ -1806,6 +1808,41 @@ private void testOverlapping()
         }
     }
 
+    private void testOverlapping2()
+    {
+        //Skip the dofinal of the test
+        DefaultMultiBlockCipher bc = new AESEngine();
+        SecureRandom random = new SecureRandom();
+        byte[] keyBytes = new byte[16];
+        random.nextBytes(keyBytes);
+        KeyParameter key = new KeyParameter(keyBytes);
+
+        int offset = 2 + random.nextInt(bc.getBlockSize() - 1);
+        byte[] data = new byte[bc.getBlockSize() * 2 + offset];
+        byte[] expected = new byte[bc.getBlockSize() * 2];
+        random.nextBytes(data);
+
+        bc.init(true, key);
+        bc.processBlocks(data, 0, 2, expected, 0);
+        bc.init(true, key);
+        bc.processBlocks(data, 0, 2, data, offset);
+
+        if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
+        {
+            fail("failed to overlapping of encryption");
+        }
+
+        bc.init(false, key);
+        bc.processBlocks(data, 0, 2, expected, 0);
+        bc.init(false, key);
+        bc.processBlocks(data, 0, 2, data, offset);
+
+        if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
+        {
+            fail("failed to overlapping of encryption");
+        }
+    }
+
     public static void main(
         String[]    args)
     {