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

Commit b7d69321 authored by Adrian Roos's avatar Adrian Roos
Browse files

FRP: Use verifyChallenge instead of verify 

Otherwise the gatekeeper payload is null, which we treat as an error.

Change-Id: I56035195fe249df15f6fe699718f41b69de5ba37
Fixes: 64478778
Test: Try to use FRP credential; verify it works.
parent 365ce730

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

+2 −2
Original line number Diff line number Diff line
@@ -625,8 +625,8 @@ public class SyntheticPasswordManager { 
            PasswordData pwd = PasswordData.fromBytes(persistentData.payload);

            byte[] pwdToken = computePasswordToken(userCredential, pwd);



            GateKeeperResponse response = gatekeeper.verify(fakeUid(persistentData.userId),

                    pwd.passwordHandle, passwordTokenToGkInput(pwdToken));

            GateKeeperResponse response = gatekeeper.verifyChallenge(fakeUid(persistentData.userId),

                    0 /* challenge */, pwd.passwordHandle, passwordTokenToGkInput(pwdToken));

            return VerifyCredentialResponse.fromGateKeeperResponse(response);

        } else if (persistentData.type == PersistentData.TYPE_SP_WEAVER) {

            PasswordData pwd = PasswordData.fromBytes(persistentData.payload);