From 37c8b411cdbbd5139b5a0abf762c24671e12657b Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Mon, 1 Jun 2015 09:52:16 -0700 Subject: [PATCH] No need to specify key size when importing. The underlying Keymaster implementation no longer requires that. Bug: 19799085 Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749 --- .../java/android/security/keystore/AndroidKeyStoreSpi.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index f159c304a2b49..701bd67a847aa 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