From 5d2ae382a589354f4ac3d27ff56dcc45697a63f0 Mon Sep 17 00:00:00 2001 From: Bill Roberts Date: Wed, 20 Dec 2023 15:42:34 -0600 Subject: [PATCH] session: do not delete on flush This behavior would not be backwards compat, but this patch does the bare minimum so we can just revert it on the next major release. Signed-off-by: Bill Roberts --- lib/tpm2_session.c | 10 ++-------- test/integration/tests/unseal.sh | 5 ----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/tpm2_session.c b/lib/tpm2_session.c index 80efc7a96..38c7df5eb 100644 --- a/lib/tpm2_session.c +++ b/lib/tpm2_session.c @@ -361,14 +361,8 @@ tool_rc tpm2_session_close(tpm2_session **s) { } if ((*s)->internal.delete && path) { - 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; - } + 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 index d0f7104f9..a29857912 100644 --- a/test/integration/tests/unseal.sh +++ b/test/integration/tests/unseal.sh @@ -156,9 +156,4 @@ 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