diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-07 18:54:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 18:54:33 +0000 |
| commit | 024bce82292786f9b71da488f06a0bb35d029bbf (patch) | |
| tree | 313cdfb020a01b348aefe531f4cf058f44d4fde9 /keystore | |
| parent | a5c82a6b2adfbad7ac9009fa6feba3e02dad0c04 (diff) | |
| parent | ca7aaeaeee616d9d1d557ee2fb19dd14783be1f0 (diff) | |
| download | frameworks_base-024bce82292786f9b71da488f06a0bb35d029bbf.zip frameworks_base-024bce82292786f9b71da488f06a0bb35d029bbf.tar.gz frameworks_base-024bce82292786f9b71da488f06a0bb35d029bbf.tar.bz2 | |
Merge "Support loading AES keys with authorized digests." into mnc-dev
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/keystore/KeyProperties.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/keystore/java/android/security/keystore/KeyProperties.java b/keystore/java/android/security/keystore/KeyProperties.java index f9fe176..2b49297 100644 --- 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) { |