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

Destroy secdiscardable file in destroyProtectorCommon()

Browse Source 
The secdiscardable file is common to all protector types, so it should
be destroyed in destroyProtectorCommon().  No change in behavior.

Change-Id: I6a5ad14c0fe37b80a009ea19db38f93af84958ed
This commit is contained in:
Eric Biggers
2022-07-27 17:36:40 +00:00
parent 3b3151b18b
commit 595976d265
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1308,7 +1308,6 @@ public class SyntheticPasswordManager {
SyntheticPasswordBlob blob = SyntheticPasswordBlob.fromBytes(loadState(SP_BLOB_NAME,
protectorId, userId));
destroyProtectorCommon(protectorId, userId);
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
if (blob.mProtectorType == PROTECTOR_TYPE_WEAK_TOKEN_BASED) {
notifyWeakEscrowTokenRemovedListeners(protectorId, userId);
}
@@ -1332,7 +1331,6 @@ public class SyntheticPasswordManager {
*/
public void destroyLskfBasedProtector(long protectorId, int userId) {
destroyProtectorCommon(protectorId, userId);
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
destroyState(PASSWORD_DATA_NAME, protectorId, userId);
destroyState(PASSWORD_METRICS_NAME, protectorId, userId);
}
@@ -1340,6 +1338,7 @@ public class SyntheticPasswordManager {
private void destroyProtectorCommon(long protectorId, int userId) {
destroyState(SP_BLOB_NAME, protectorId, userId);
destroySPBlobKey(getKeyName(protectorId));
destroyState(SECDISCARDABLE_NAME, protectorId, userId);
if (hasState(WEAVER_SLOT_NAME, protectorId, userId)) {
destroyWeaverSlot(protectorId, userId);
}