Revert "session: do not delete on flush"

This reverts commit b654a56. Signed-off-by: Bill Roberts <[email protected]>
tpm2-software · Dec 20, 2023 · 469a686 · 469a686
1 parent b654a56
commit 469a686
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/tpm2_session.c b/lib/tpm2_session.c
@@ -361,8 +361,14 @@ tool_rc tpm2_session_close(tpm2_session **s) {
  }
 
  if ((*s)->internal.delete && path) {
- rc = tool_rc_success;
- goto out2;
+ if (remove(path)) {
+ LOG_ERR("File \"%s\" can't be deleted.", path);
+ rc = tool_rc_general_error;
+ goto out2;
+ } else {
+ rc = tool_rc_success;
+ goto out2;
+ }
  }
 
  FILE *session_file = path ? fopen(path, "w+b") : NULL;

diff --git a/test/integration/tests/unseal.sh b/test/integration/tests/unseal.sh
@@ -156,4 +156,9 @@ tpm2 sessionconfig enc_session.ctx --enable-encrypt --disable-continuesession
 unsealed=`tpm2 unseal -c seal_key.ctx -p sealkeypass -S enc_session.ctx`
 test "$unsealed" == "$secret"
 
+if [ -e enc_session.ctx ]; then
+ echo "enc_session.ctx was not deleted.";
+ exit 1
+fi
+
 exit 0