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

Merge "Check for secdiscardable file missing" into udc-dev

Browse Source
This commit is contained in:
Eric Biggers
2023-02-23 18:24:21 +00:00
committed by Android (Google) Code Review
parent 697a395a3c 174f792e60
commit 3e7585ed18
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View File

@@ -1245,8 +1245,13 @@ class SyntheticPasswordManager {
}
sid = sidFromPasswordHandle(pwd.passwordHandle);
}
protectorSecret = transformUnderSecdiscardable(stretchedLskf,
loadSecdiscardable(protectorId, userId));
byte[] secdiscardable = loadSecdiscardable(protectorId, userId);
if (secdiscardable == null) {
Slog.e(TAG, "secdiscardable file not found");
result.gkResponse = VerifyCredentialResponse.ERROR;
return result;
}
protectorSecret = transformUnderSecdiscardable(stretchedLskf, secdiscardable);
}
// Supplied credential passes first stage weaver/gatekeeper check so it should be correct.
// Notify the callback so the keyguard UI can proceed immediately.
@@ -1311,6 +1316,11 @@ class SyntheticPasswordManager {
byte[] token, int userId) {
AuthenticationResult result = new AuthenticationResult();
byte[] secdiscardable = loadSecdiscardable(protectorId, userId);
if (secdiscardable == null) {
Slog.e(TAG, "secdiscardable file not found");
result.gkResponse = VerifyCredentialResponse.ERROR;
return result;
}
int slotId = loadWeaverSlot(protectorId, userId);
if (slotId != INVALID_WEAVER_SLOT) {
if (!isWeaverAvailable()) {