commit 60c71b9950054b5fcaf792db415d2512fd059284
author Eric Biggers <ebiggers@google.com> Sat Mar 04 06:30:21 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 04 06:30:21 2023 +0000
tree c99d8fa0015371a3bf5c7cfb38b977b52cd4f63c
parent 0c7abb02e5cba86f644874510dd19b1ee5ef1472
parent dc262c27f0702b5e2e859af9c2059308d2567c64

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

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>

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 55c1709..837bb1a 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -660,8 +660,11 @@
         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}) {