Skip to content

Revert "session: do not delete on flush" #3326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamcroberts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "session: do not delete on flush" #3326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/tpm2_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions test/integration/tests/unseal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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