am 70c4b873: am b1b3be8e: am eb9c8613: am 024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev

* commit '70c4b873786fca6551d5c842edf21dc5ba9427f1': Support loading AES keys with authorized digests.
2015-07-07 19:47:26 +00:00
parent 9508ebf132 70c4b87378
commit 9061d3cb90
1 changed files with 0 additions and 4 deletions
--- a/keystore/java/android/security/keystore/KeyProperties.java
+++ b/keystore/java/android/security/keystore/KeyProperties.java
@@ -210,10 +210,6 @@ public abstract class KeyProperties {
                int keymasterAlgorithm, int keymasterDigest) {
            switch (keymasterAlgorithm) {
                case KeymasterDefs.KM_ALGORITHM_AES:
-                    if (keymasterDigest != -1) {
-                        throw new IllegalArgumentException("Digest not supported for AES key: "
-                                + Digest.fromKeymaster(keymasterDigest));
-                    }
                    return KEY_ALGORITHM_AES;
                case KeymasterDefs.KM_ALGORITHM_HMAC:
                    switch (keymasterDigest) {