corrected overlap test to use doFinal(), oh dear...

Author: dghgit

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

@@ -1760,6 +1760,7 @@ private void testIncorrectCipherModes()
     }
 
     public void performTest()
+        throws Exception
     {
         for (int i = 0; i != cipherTests1.length; i += 2)
         {
@@ -1828,6 +1829,7 @@ private void doFinalTest()
     }
 
     private void testOverlapping()
+        throws Exception
     {
         //Skip the dofinal of the test
         BufferedBlockCipher bc = new BufferedBlockCipher(AESEngine.newInstance());
@@ -1842,9 +1844,12 @@ private void testOverlapping()
         random.nextBytes(data);
 
         bc.init(true, key);
-        bc.processBytes(data, 0, bc.getBlockSize() * 2 + 1, expected, 0);
+        int r = bc.processBytes(data, 0, bc.getBlockSize() * 2, expected, 0);
+        r += bc.doFinal(expected, r);
+
         bc.init(true, key);
-        bc.processBytes(data, 0, bc.getBlockSize() * 2 + 1, data, offset);
+        r = bc.processBytes(data, 0, bc.getBlockSize() * 2, data, offset);
+        r += bc.doFinal(data, r + offset);
 
         if (!areEqual(expected, Arrays.copyOfRange(data, offset, offset + bc.getBlockSize() * 2)))
         {