commit dc262c27f0702b5e2e859af9c2059308d2567c64
author Eric Biggers <ebiggers@google.com> Fri Mar 03 22:14:58 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 03 22:14:58 2023 +0000
tree c99d8fa0015371a3bf5c7cfb38b977b52cd4f63c
parent 826eef6b332d2beb2bd4407c2ab4c736f5161ca6
parent 73e2936fc25a0098d59205457bf48c721492f429

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

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}) {