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

Commit 291718cd authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fixing default behavior for keys requiring auth"" into rvc-dev

parents cb016498 382e7247

keystore/java/android/security/keystore/KeyGenParameterSpec.java

+2 −3
Original line number Diff line number Diff line
@@ -764,9 +764,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
        private @KeyProperties.BlockModeEnum String[] mBlockModes;

        private boolean mRandomizedEncryptionRequired = true;

        private boolean mUserAuthenticationRequired;

        private int mUserAuthenticationValidityDurationSeconds = 0;

        private @KeyProperties.AuthEnum int mUserAuthenticationType =

                KeyProperties.AUTH_BIOMETRIC_STRONG;

        private int mUserAuthenticationValidityDurationSeconds = -1;

        private @KeyProperties.AuthEnum int mUserAuthenticationType;

        private boolean mUserPresenceRequired = false;

        private byte[] mAttestationChallenge = null;

        private boolean mUniqueIdIncluded = false;

keystore/java/android/security/keystore/KeyProtection.java

+2 −3
Original line number Diff line number Diff line
@@ -562,9 +562,8 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs { 
        private @KeyProperties.BlockModeEnum String[] mBlockModes;

        private boolean mRandomizedEncryptionRequired = true;

        private boolean mUserAuthenticationRequired;

        private @KeyProperties.AuthEnum int mUserAuthenticationType =

                KeyProperties.AUTH_BIOMETRIC_STRONG;

        private int mUserAuthenticationValidityDurationSeconds = 0;

        private @KeyProperties.AuthEnum int mUserAuthenticationType;

        private int mUserAuthenticationValidityDurationSeconds = -1;

        private boolean mUserPresenceRequired = false;

        private boolean mUserAuthenticationValidWhileOnBody;

        private boolean mInvalidatedByBiometricEnrollment = true;

keystore/java/android/security/keystore/KeymasterUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ public abstract class KeymasterUtils { 
            }

            args.addUnsignedLong(KeymasterDefs.KM_TAG_USER_SECURE_ID,

                    KeymasterArguments.toUint64(sid));

            args.addEnum(KeymasterDefs.KM_TAG_USER_AUTH_TYPE, spec.getUserAuthenticationType());

            args.addEnum(KeymasterDefs.KM_TAG_USER_AUTH_TYPE,

                    KeymasterDefs.HW_AUTH_PASSWORD | KeymasterDefs.HW_AUTH_BIOMETRIC);

            args.addUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT,

                    spec.getUserAuthenticationValidityDurationSeconds());

            if (spec.isUserAuthenticationValidWhileOnBody()) {