diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-01 09:52:16 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-06-01 09:52:16 -0700 |
| commit | 37c8b411cdbbd5139b5a0abf762c24671e12657b (patch) | |
| tree | 4654e517f42f30b5eb74bfd1e7f2b16a80660c6a /keystore | |
| parent | 3aa33b3da04774d76e1a65b749667450dc81532b (diff) | |
| download | frameworks_base-37c8b411cdbbd5139b5a0abf762c24671e12657b.zip frameworks_base-37c8b411cdbbd5139b5a0abf762c24671e12657b.tar.gz frameworks_base-37c8b411cdbbd5139b5a0abf762c24671e12657b.tar.bz2 | |
No need to specify key size when importing.
The underlying Keymaster implementation no longer requires that.
Bug: 19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreSpi.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index f159c30..701bd67 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java @@ -621,9 +621,6 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { (params.getKeyValidityForConsumptionEnd() != null) ? params.getKeyValidityForConsumptionEnd() : new Date(Long.MAX_VALUE)); - // TODO: Remove this once keymaster does not require us to specify the size of imported key. - args.addInt(KeymasterDefs.KM_TAG_KEY_SIZE, keyMaterial.length * 8); - if (((purposes & KeyProperties.PURPOSE_ENCRYPT) != 0) && (!params.isRandomizedEncryptionRequired())) { // Permit caller-provided IV when encrypting with this key |