diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-03-04 08:28:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-04 08:28:24 +0000 |
| commit | 9e230787026c6e383aeaf7f2211caa41656e9927 (patch) | |
| tree | 9a15af83140b20bc38521c418084c31219814828 | |
| parent | 3b9d19f52cff77a73cb0a9569831b68d4b59fa44 (diff) | |
| parent | 10f3d7ec328694631cb4ecbfe085205129f6562c (diff) | |
| download | vold-9e230787026c6e383aeaf7f2211caa41656e9927.tar.gz | |
Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27f0 am: 60c71b9950 am: 2ef1832ac4 am: 10f3d7ec32
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2470460
Change-Id: I069d4cb6fb7e07fee3139c3036ccf92c5d5078ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | KeyStorage.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/KeyStorage.cpp b/KeyStorage.cpp index 33d415ef..5090b4e6 100644 --- a/KeyStorage.cpp +++ b/KeyStorage.cpp @@ -658,8 +658,11 @@ bool destroyKey(const std::string& dir) { kSecdiscardPath, "--", 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. for (auto& fn : {kFn_keymaster_key_blob, kFn_keymaster_key_blob_upgraded}) { |