Revert "Revert "Cut down on object allocation in CipherInputStream""

This reverts commit 6b3f9499cf6647263b51741e4187a26a54500072.

Bug: 6523748
Bug: 6478569
Change-Id: Ic422e5fa320995600bdae7a42816652e16b8728b

1 files changed, 18 insertions, 17 deletions

diff --git a/luni/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index c8cb601..1dacd46 100644
--- a/luni/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
@@ -886,17 +886,25 @@ public class Cipher {
         if (input == null) {
             throw new IllegalArgumentException("input == null");
         }
-        if (inputOffset < 0 || inputLen < 0
-                || inputLen > input.length
-                || inputOffset > input.length - inputLen) {
-            throw new IllegalArgumentException("Incorrect inputOffset/inputLen parameters");
-        }
+        checkInputOffsetAndCount(input.length, inputOffset, inputLen);
         if (input.length == 0) {
             return null;
         }
         return spiImpl.engineUpdate(input, inputOffset, inputLen);
     }
 
+    private static void checkInputOffsetAndCount(int inputArrayLength,
+                                                 int inputOffset,
+                                                 int inputLen) {
+        if ((inputOffset | inputLen) < 0
+                || inputOffset > inputArrayLength
+                || inputArrayLength - inputOffset < inputLen) {
+            throw new IllegalArgumentException("input.length=" + inputArrayLength
+                                               + "; inputOffset=" + inputOffset
+                                               + "; inputLen=" + inputLen);
+        }
+    }
+
     /**
      * Continues a multi-part transformation (encryption or decryption). The
      * transformed bytes are stored in the {@code output} buffer.
@@ -972,12 +980,9 @@ public class Cipher {
             throw new IllegalArgumentException("output == null");
         }
         if (outputOffset < 0) {
-            throw new IllegalArgumentException("outputOffset < 0");
-        }
-        if (inputOffset < 0 || inputLen < 0 || inputLen > input.length
-                || inputOffset > input.length - inputLen) {
-            throw new IllegalArgumentException("Incorrect inputOffset/inputLen parameters");
+            throw new IllegalArgumentException("outputOffset < 0. outputOffset=" + outputOffset);
         }
+        checkInputOffsetAndCount(input.length, inputOffset, inputLen);
         if (input.length == 0) {
             return 0;
         }
@@ -1075,7 +1080,7 @@ public class Cipher {
             throw new IllegalStateException();
         }
         if (outputOffset < 0) {
-            throw new IllegalArgumentException("outputOffset < 0");
+            throw new IllegalArgumentException("outputOffset < 0. outputOffset=" + outputOffset);
         }
         return spiImpl.engineDoFinal(null, 0, 0, output, outputOffset);
     }
@@ -1137,9 +1142,7 @@ public class Cipher {
         if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
             throw new IllegalStateException();
         }
-        if (inputOffset < 0 || inputLen < 0 || inputOffset + inputLen > input.length) {
-            throw new IllegalArgumentException("Incorrect inputOffset/inputLen parameters");
-        }
+        checkInputOffsetAndCount(input.length, inputOffset, inputLen);
         return spiImpl.engineDoFinal(input, inputOffset, inputLen);
     }
 
@@ -1217,9 +1220,7 @@ public class Cipher {
         if (mode != ENCRYPT_MODE && mode != DECRYPT_MODE) {
             throw new IllegalStateException();
         }
-        if (inputOffset < 0 || inputLen < 0 || inputOffset + inputLen > input.length) {
-            throw new IllegalArgumentException("Incorrect inputOffset/inputLen parameters");
-        }
+        checkInputOffsetAndCount(input.length, inputOffset, inputLen);
         return spiImpl.engineDoFinal(input, inputOffset, inputLen, output,
                 outputOffset);
     }