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

Commit 3e7585ed authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

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

parents 697a395a 174f792e

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+12 −2
Original line number Diff line number Diff line
@@ -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()) {