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

Merge "Fixing default behavior for keys requiring auth" into rvc-dev am: 27deb3b711

Browse Source 
Change-Id: I1c415542b4004134fde4fb0ddb598476db5f3d63
This commit is contained in:
Automerger Merge Worker
2020-03-12 15:45:55 +00:00
parent 6b6d2390db 27deb3b711
commit 7b6ea4e8f1
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystore/java/android/security/keystore/KeyGenParameterSpec.java
View File

@@ -764,8 +764,9 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
private @KeyProperties.BlockModeEnum String[] mBlockModes; private @KeyProperties.BlockModeEnum String[] mBlockModes;
private boolean mRandomizedEncryptionRequired = true; private boolean mRandomizedEncryptionRequired = true;
private boolean mUserAuthenticationRequired; private boolean mUserAuthenticationRequired;
private int mUserAuthenticationValidityDurationSeconds = -1; private int mUserAuthenticationValidityDurationSeconds = 0;
private @KeyProperties.AuthEnum int mUserAuthenticationType; private @KeyProperties.AuthEnum int mUserAuthenticationType =
KeyProperties.AUTH_BIOMETRIC_STRONG;
private boolean mUserPresenceRequired = false; private boolean mUserPresenceRequired = false;
private byte[] mAttestationChallenge = null; private byte[] mAttestationChallenge = null;
private boolean mUniqueIdIncluded = false; private boolean mUniqueIdIncluded = false;
@@ -1240,7 +1241,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
if (seconds == -1) { if (seconds == -1) {
return setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG); return setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG);
} }
return setUserAuthenticationParameters(seconds, KeyProperties.AUTH_BIOMETRIC_STRONG); return setUserAuthenticationParameters(seconds, KeyProperties.AUTH_DEVICE_CREDENTIAL
| KeyProperties.AUTH_BIOMETRIC_STRONG);
} }
/** /**

8
keystore/java/android/security/keystore/KeyProtection.java
View File

@@ -562,8 +562,9 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {
private @KeyProperties.BlockModeEnum String[] mBlockModes; private @KeyProperties.BlockModeEnum String[] mBlockModes;
private boolean mRandomizedEncryptionRequired = true; private boolean mRandomizedEncryptionRequired = true;
private boolean mUserAuthenticationRequired; private boolean mUserAuthenticationRequired;
private @KeyProperties.AuthEnum int mUserAuthenticationType; private int mUserAuthenticationValidityDurationSeconds = 0;
private int mUserAuthenticationValidityDurationSeconds = -1; private @KeyProperties.AuthEnum int mUserAuthenticationType =
KeyProperties.AUTH_BIOMETRIC_STRONG;
private boolean mUserPresenceRequired = false; private boolean mUserPresenceRequired = false;
private boolean mUserAuthenticationValidWhileOnBody; private boolean mUserAuthenticationValidWhileOnBody;
private boolean mInvalidatedByBiometricEnrollment = true; private boolean mInvalidatedByBiometricEnrollment = true;
@@ -870,7 +871,8 @@ public final class KeyProtection implements ProtectionParameter, UserAuthArgs {
if (seconds == -1) { if (seconds == -1) {
return setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG); return setUserAuthenticationParameters(0, KeyProperties.AUTH_BIOMETRIC_STRONG);
} }
return setUserAuthenticationParameters(seconds, KeyProperties.AUTH_BIOMETRIC_STRONG); return setUserAuthenticationParameters(seconds, KeyProperties.AUTH_DEVICE_CREDENTIAL
| KeyProperties.AUTH_BIOMETRIC_STRONG);
} }
/** /**

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

@@ -165,8 +165,7 @@ public abstract class KeymasterUtils {
} }
args.addUnsignedLong(KeymasterDefs.KM_TAG_USER_SECURE_ID, args.addUnsignedLong(KeymasterDefs.KM_TAG_USER_SECURE_ID,
KeymasterArguments.toUint64(sid)); KeymasterArguments.toUint64(sid));
args.addEnum(KeymasterDefs.KM_TAG_USER_AUTH_TYPE, args.addEnum(KeymasterDefs.KM_TAG_USER_AUTH_TYPE, spec.getUserAuthenticationType());
KeymasterDefs.HW_AUTH_PASSWORD | KeymasterDefs.HW_AUTH_BIOMETRIC);
args.addUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT, args.addUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT,
spec.getUserAuthenticationValidityDurationSeconds()); spec.getUserAuthenticationValidityDurationSeconds());
if (spec.isUserAuthenticationValidWhileOnBody()) { if (spec.isUserAuthenticationValidWhileOnBody()) {