tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460

Change-Id: I0259a28cc469a98149512f258751771f09112fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-03-04 06:30:21 +00:00 committed by Automerger Merge Worker
commit 60c71b9950
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
KeyStorage.cpp
View file

@ -660,8 +660,11 @@ bool destroyKey(const std::string& dir) {
kSecdiscardPath, kSecdiscardPath,
"--", "--",
dir + "/" + kFn_encrypted_key, dir + "/" + kFn_encrypted_key,
dir + "/" + kFn_secdiscardable,
}; };
auto secdiscardable = dir + "/" + kFn_secdiscardable;
if (pathExists(secdiscardable)) {
secdiscard_cmd.push_back(secdiscardable);
}
// Try each thing, even if previous things failed. // Try each thing, even if previous things failed.
for (auto& fn : {kFn_keymaster_key_blob, kFn_keymaster_key_blob_upgraded}) { for (auto& fn : {kFn_keymaster_key_blob, kFn_keymaster_key_blob_upgraded}) {