corrected doFinal() calculation for partial block servers.

dghgit · dghgit · commit 654608413cc2 · 2025-08-18T15:09:27.000+10:00
diff --git a/core/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java b/core/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
@@ -352,8 +352,8 @@ public int doFinal(
 
                     cipher.processBlock(buf, index, buf, index);
                     resultLen += bufOff - index;
+                    System.arraycopy(buf, index, out, outOff, bufOff - index);
                     bufOff = 0;
-                    System.arraycopy(buf, index, out, outOff, resultLen);
                 }
             }
 
diff --git a/core/src/main/java/org/bouncycastle/crypto/DefaultBufferedBlockCipher.java b/core/src/main/java/org/bouncycastle/crypto/DefaultBufferedBlockCipher.java
@@ -354,8 +354,8 @@ public int doFinal(
 
                     cipher.processBlock(buf, index, buf, index);
                     resultLen += bufOff - index;
+                    System.arraycopy(buf, index, out, outOff, bufOff - index);
                     bufOff = 0;
-                    System.arraycopy(buf, index, out, outOff, resultLen);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,8 @@ public int doFinal(`
`352`	`352`
`353`	`353`	`cipher.processBlock(buf, index, buf, index);`
`354`	`354`	`resultLen += bufOff - index;`
	`355`	`+ System.arraycopy(buf, index, out, outOff, bufOff - index);`
`355`	`356`	`bufOff = 0;`
`356`		`- System.arraycopy(buf, index, out, outOff, resultLen);`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,8 @@ public int doFinal(`
`354`	`354`
`355`	`355`	`cipher.processBlock(buf, index, buf, index);`
`356`	`356`	`resultLen += bufOff - index;`
	`357`	`+ System.arraycopy(buf, index, out, outOff, bufOff - index);`
`357`	`358`	`bufOff = 0;`
`358`		`- System.arraycopy(buf, index, out, outOff, resultLen);`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`