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

Commit a1077c5d authored by Ellen Arteca's avatar Ellen Arteca Committed by Automerger Merge Worker
Browse files

Merge "Mitigate LSKF leaks in RecoverableKeyStoreManager" into main am: 4857d701 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3057483



Change-Id: I844a1c7fdaa80eab5fa53a7bf7f30605a1dc008a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 284f4ffb 4857d701

services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,8 @@ public class RecoverableKeyStoreManager { 
            int keyguardCredentialsType = lockPatternUtilsToKeyguardType(savedCredentialType);

            try (LockscreenCredential credential =

                    createLockscreenCredential(keyguardCredentialsType, decryptedCredentials)) {

                // TODO(b/254335492): remove decryptedCredentials

                Arrays.fill(decryptedCredentials, (byte) 0);

                decryptedCredentials = null;

                VerifyCredentialResponse verifyResponse =

                        lockSettingsService.verifyCredential(credential, userId, 0);

                return handleVerifyCredentialResponse(verifyResponse, userId);