Skip to content

Use password based sessions if no other session types specified #3587

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
matthewruffell wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

Use password based sessions if no other session types specified #3587

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
18 changes: 17 additions & 1 deletion lib/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <stdio.h>
#include <string.h>

#include "files.h"
#include "log.h"
Expand All @@ -11,6 +12,15 @@
#define NULL_OBJECT "null"
#define NULL_OBJECT_LEN (sizeof(NULL_OBJECT) - 1)

#define SESSION_PREFIX "session:"
#define SESSION_PREFIX_LEN sizeof(SESSION_PREFIX) - 1

@moritzbuhl moritzbuhl Jun 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrap it in braces! Otherwise something like SESSION_PREFIX_LEN * 2 would result in sizeof(SESSION_PREFIX) - 2.
The others too.

@matthewruffell matthewruffell Jun 19, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the better idea, I just wanted to copy

tpm2-tools/lib/tpm2_auth_util.c

Lines 27 to 28 in 844a611

#define SESSION_PREFIX "session:"
#define SESSION_PREFIX_LEN sizeof(SESSION_PREFIX) - 1
incase you ever wanted to move this to a common header file.


#define FILE_PREFIX "file:"
#define FILE_PREFIX_LEN sizeof(FILE_PREFIX) - 1

#define PCR_PREFIX "pcr:"
#define PCR_PREFIX_LEN sizeof(PCR_PREFIX) - 1

TPM2B_PRIVATE tpm2_util_object_tsspem_priv = { 0 };
TPM2B_PUBLIC tpm2_util_object_tsspem_pub = { 0 };

Expand Down Expand Up @@ -411,6 +421,12 @@ tool_rc tpm2_util_object_load_auth(ESYS_CONTEXT *ctx, const char *objectstr,
const char *auth, tpm2_loaded_object *outobject,
bool is_restricted_pswd_session, tpm2_handle_flags flags) {

bool is_session = auth && !strncmp(auth, SESSION_PREFIX, SESSION_PREFIX_LEN);
bool is_file = auth && !strncmp(auth, FILE_PREFIX, FILE_PREFIX_LEN);
bool is_pcr = auth && !strncmp(auth, PCR_PREFIX, PCR_PREFIX_LEN);
bool use_restricted_pswd_session = is_restricted_pswd_session &&
!is_session && !is_file && !is_pcr;

return tpm2_util_object_load2(ctx, objectstr, auth, true, outobject,
is_restricted_pswd_session, flags);
use_restricted_pswd_session, flags);
}
Loading