Enable hex values to be used for tpm_ownerpassword #769
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Isaac-Matthews
force-pushed
the
hex_auth_values
branch
from
8195d1a to
a930cef
Compare
THS-on
requested changes
Apr 9, 2024
keylime-bot
assigned
Isaac-Matthews and unassigned
maugustosilva,
lukehinds and
ansasaki
Isaac-Matthews
force-pushed
the
hex_auth_values
branch
2 times, most recently
from
d830deb to
79db4aa
Compare
ueno
approved these changes
Apr 10, 2024
Contributor
ueno
left a comment
ueno
left a comment
There was a problem hiding this comment.
A couple of minor nits, but otherwise it looks good to me.
keylime-agent/src/main.rs
Outdated
| let auth = if tpm_ownerpassword.starts_with("hex:") { | ||
| let (_, hex_ownerpassword) = tpm_ownerpassword.split_at(4); | ||
| let decoded_ownerpassword = hex::decode(hex_ownerpassword) | ||
| .map_err(|_| { |
Contributor
There was a problem hiding this comment.
Not sure if this manual conversion is required, as FromHex error is already defined.
Isaac-Matthews
force-pushed
the
hex_auth_values
branch
from
f5cc63f to
7a80b1f
Compare
Contributor
Author
Thanks for the feedback, I have made both changes and merged into one commit. |
Signed-off-by: Isaac-Matthews <isaac.matthews@hpe.com>
Isaac-Matthews
force-pushed
the
hex_auth_values
branch
from
7a80b1f to
fb65f89
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Contributor
|
@THS-on Hi, could you please mark your request as solved? Otherwise I cannot merge this. |
THS-on
approved these changes
Apr 26, 2024
keylime-bot
assigned
maugustosilva,
lukehinds and
ansasaki and unassigned
Isaac-Matthews
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #760.
If a TPM has been set up with a non-string auth value, for example by running:
tpm2_changeauth -c E "hex:0000DF0237BE41C0E0124CAAD0A619B29B8E3EE4173521656729C6F339DBC449"the keylime agent is not currently compatible with the TPM as there is no way provide this value.
This fixes the issue, by checking for "hex:" at the start of the tpm password and using a hex password if it is found.