Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de6dea6 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "No need to specify key size when importing." into mnc-dev

parents 0fddb1a6 37c8b411

keystore/java/android/security/keystore/AndroidKeyStoreSpi.java

+0 −3
Original line number Diff line number Diff line
@@ -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