Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev

Browse Source 
* commit '0de6dea6fb0c3b87e967c4c223f5edda359d1c8c':
  No need to specify key size when importing.
This commit is contained in:
Alex Klyubin
2015-06-01 18:05:00 +00:00
committed by Android Git Automerger
parent 9250d9727b 0de6dea6fb
commit 18fa91765a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
View File

@@ -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