further tweaking of doFinal.

zjsunzone · Mar 8, 2019 · 12e88a1 · 12e88a1
1 parent 49f06a4
commit 12e88a1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceBlockCipherImpl.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceBlockCipherImpl.java
@@ -15,6 +15,8 @@
 public class JceBlockCipherImpl
     implements TlsBlockCipherImpl
 {
+    private static final int BUF_SIZE = 32 * 1024;
+
     private final int cipherMode;
     private final Cipher cipher;
     private final String algorithm;
@@ -58,6 +60,14 @@ public int doFinal(byte[] input, int inputOffset, int inputLength, byte[] output
         try
         {
             // to avoid performance issue in FIPS jar  1.0.0-1.0.2
+            while (inputLength > BUF_SIZE)
+            {
+                outputOffset += cipher.update(input, inputOffset, BUF_SIZE, output, outputOffset);
+
+                inputOffset += BUF_SIZE;
+                inputLength -= BUF_SIZE;
+            }
+
             int len = cipher.update(input, inputOffset, inputLength, output, outputOffset) ;
 
             len += cipher.doFinal(output, outputOffset + len);

diff --git a/...ain/java/org/bouncycastle/tls/crypto/impl/jcajce/JceBlockCipherWithCBCImplicitIVImpl.java b/...ain/java/org/bouncycastle/tls/crypto/impl/jcajce/JceBlockCipherWithCBCImplicitIVImpl.java
@@ -17,6 +17,8 @@
 public class JceBlockCipherWithCBCImplicitIVImpl
     implements TlsBlockCipherImpl
 {
+    private static final int BUF_SIZE = 32 * 1024;
+
     private final Cipher cipher;
     private final String algorithm;
     private final boolean isEncrypting;
@@ -61,6 +63,14 @@ public int doFinal(byte[] input, int inputOffset, int inputLength, byte[] output
             }
 
             // to avoid performance issue in FIPS jar  1.0.0-1.0.2
+            while (inputLength > BUF_SIZE)
+            {
+                outputOffset += cipher.update(input, inputOffset, BUF_SIZE, output, outputOffset);
+
+                inputOffset += BUF_SIZE;
+                inputLength -= BUF_SIZE;
+            }
+
             int len = cipher.update(input, inputOffset, inputLength, output, outputOffset) ;
 
             len += cipher.doFinal(output, outputOffset + len);

diff --git a/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceChaCha20Poly1305.java b/tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceChaCha20Poly1305.java
@@ -19,6 +19,7 @@
 
 public class JceChaCha20Poly1305 implements TlsAEADCipherImpl
 {
+    private static final int BUF_SIZE = 32 * 1024;
     private static final byte[] ZEROES = new byte[15];
 
     protected final Cipher cipher;
@@ -55,11 +56,17 @@ public int doFinal(byte[] input, int inputOffset, int inputLength, byte[] output
                 System.arraycopy(input, inputOffset, tmp, 64, ciphertextLength);
 
                 // to avoid performance issue in FIPS jar  1.0.0-1.0.2
-                int len = cipher.update(tmp, 0, tmp.length, tmp, 0) ;
+                int tmpOff = 0;
+                while (tmpOff < tmp.length - BUF_SIZE)
+                {
+                    tmpOff += cipher.update(tmp, tmpOff, BUF_SIZE, tmp, tmpOff);
+                }
+
+                int len = cipher.update(tmp, tmpOff, tmp.length - tmpOff, tmp, tmpOff);
 
                 len += cipher.doFinal(tmp, len);
 
-                if (tmp.length != len)
+                if (tmp.length != tmpOff + len)
                 {
                     throw new IllegalStateException();
                 }
@@ -86,7 +93,18 @@ public int doFinal(byte[] input, int inputOffset, int inputLength, byte[] output
                 byte[] tmp = new byte[64 + ciphertextLength];
                 System.arraycopy(input, inputOffset, tmp, 64, ciphertextLength);
 
-                if (tmp.length != cipher.doFinal(tmp, 0, tmp.length, tmp, 0))
+                // to avoid performance issue in FIPS jar  1.0.0-1.0.2
+                int tmpOff = 0;
+                while (tmpOff < tmp.length - BUF_SIZE)
+                {
+                    tmpOff += cipher.update(tmp, tmpOff, BUF_SIZE, tmp, tmpOff);
+                }
+
+                int len = cipher.update(tmp, tmpOff, tmp.length - tmpOff, tmp, tmpOff);
+
+                len += cipher.doFinal(tmp, len);
+
+                if (tmp.length != tmpOff + len)
                 {
                     throw new IllegalStateException();
                 }