fixed process block calculation to ensue full buffer processing in multi-block case.

Author: dghgit

core/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java

@@ -256,7 +256,7 @@ public int processBytes(
 
             if (mbCipher != null)
             {
-                int blockCount = len / blockSize;
+                int blockCount = (len / mbCipher.getMultiBlockSize()) * (mbCipher.getMultiBlockSize() / blockSize);
 
                 if (blockCount > 0)
                 {
@@ -351,8 +351,8 @@ public int doFinal(
                     }
 
                     cipher.processBlock(buf, index, buf, index);
+                    System.arraycopy(buf, index, out, outOff + resultLen, bufOff - index);
                     resultLen += bufOff - index;
-                    System.arraycopy(buf, index, out, outOff, bufOff - index);
                     bufOff = 0;
                 }
             }

core/src/main/java/org/bouncycastle/crypto/DefaultBufferedBlockCipher.java

@@ -258,7 +258,7 @@ public int processBytes(
 
             if (mbCipher != null)
             {
-                int blockCount = len / blockSize;
+                int blockCount = (len / mbCipher.getMultiBlockSize()) * (mbCipher.getMultiBlockSize() / blockSize);
 
                 if (blockCount > 0)
                 {
@@ -353,8 +353,8 @@ public int doFinal(
                     }
 
                     cipher.processBlock(buf, index, buf, index);
+                    System.arraycopy(buf, index, out, outOff + resultLen, bufOff - index);
                     resultLen += bufOff - index;
-                    System.arraycopy(buf, index, out, outOff, bufOff - index);
                     bufOff = 0;
                 }
             }