commit fa68edd520fe9c0e4cfafe43a86a973ad1143a0c
author Piotr Jastrzebski <haaawk@google.com> Fri Apr 10 14:14:00 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Nov 11 11:34:48 2015 +0000
tree be8287ae743d26e1fabc8ec8155b482ed4117c2a
parent ad443e7ceec1ec85fde5bf8b35d2ae7233040bd1

Cipher: Throw early on getMaxAllowedKeyLength / getMaxAllowedParameterSpec

NPE on null transforms and NoSuchAlgorithmException if the specified
transform is invalid.

Change-Id: I368b96f98d01a1209ee467ddfcc6a05bc78723ec

ojluni/src/main/java/javax/crypto/Cipher.java

diff --git a/ojluni/src/main/java/javax/crypto/Cipher.java b/ojluni/src/main/java/javax/crypto/Cipher.java
index 8a66345..fcea1f2 100755
--- a/ojluni/src/main/java/javax/crypto/Cipher.java
+++ b/ojluni/src/main/java/javax/crypto/Cipher.java
@@ -2494,12 +2494,17 @@
      */
     public static final int getMaxAllowedKeyLength(String transformation)
             throws NoSuchAlgorithmException {
-        /* ----- BEGIN android -----
-        CryptoPermission cp = getConfiguredPermission(transformation);
-        return cp.getMaxKeySize();
-        */
+        // Android-changed: Remove references to CryptoPermission and throw early
+        // if transformation == null or isn't valid.
+        //
+        // CryptoPermission cp = getConfiguredPermission(transformation);
+        // return cp.getMaxAllowedKeyLength();
+        if (transformation == null) {
+            throw new NullPointerException("transformation == null");
+        }
+        // Throws NoSuchAlgorithmException if necessary.
+        tokenizeTransformation(transformation);
         return Integer.MAX_VALUE;
-        // ----- END android -----
     }
 
     /**
@@ -2522,12 +2527,17 @@
      */
     public static final AlgorithmParameterSpec getMaxAllowedParameterSpec(
             String transformation) throws NoSuchAlgorithmException {
-        /* ----- BEGIN android -----
-        CryptoPermission cp = getConfiguredPermission(transformation);
-        return cp.getAlgorithmParameterSpec();
-        */
+        // Android-changed: Remove references to CryptoPermission and throw early
+        // if transformation == null or isn't valid.
+        //
+        // CryptoPermission cp = getConfiguredPermission(transformation);
+        // return cp.getAlgorithmParameterSpec();
+        if (transformation == null) {
+            throw new NullPointerException("transformation == null");
+        }
+        // Throws NoSuchAlgorithmException if necessary.
+        tokenizeTransformation(transformation);
         return null;
-        // ----- END android -----
     }
 
     /**