efi: Prepare to add pre-install detection #309
Merged
Conversation
This file contains 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
This changes a few types, replaces pcrProfileFlags with pcrFlags and introduces a PCRProfileEnablePCRsOption interface which is implemented by the existing profile options and will be implemenented by a new composite option returned by the detection code.
pedronis
reviewed
Jun 7, 2024
pedronis
approved these changes
Jun 11, 2024
efi/image_rules_defs.go
Outdated
| @@ -50,7 +50,7 @@ func makeMicrosoftUEFICASecureBootNamespaceRules() *secureBootNamespaceRules { | |||
| 0x13, 0xad, 0xbf, 0x43, 0x09, 0xbd, 0x82, 0x70, 0x9c, 0x8c, | |||
| 0xd5, 0x4f, 0x31, 0x6e, 0xd5, 0x22, 0x98, 0x8a, 0x1b, 0xd4, | |||
| }, | |||
| // pubkey alg | |||
| // pubkey a;g | |||
| PCRProfileOption | ||
| PCRs() tpm2.HandleList | ||
| } | ||
|
|
There was a problem hiding this comment.
nitpick: shouldn't this definition come after the PCRProfileOption one?
There was a problem hiding this comment.
I've moved this now
| @@ -101,32 +99,32 @@ func (h *fwLoadHandler) measureSecureBootPolicyPreOS(ctx pcrBranchContext) error | |||
| events = events[1:] | |||
|
|
|||
| switch { | |||
| case e.PCRIndex < secureBootPCR && e.EventType == tcglog.EventTypeSeparator: | |||
| case e.PCRIndex < tcglog.PCRIndex(secureBootPolicyPCR) && e.EventType == tcglog.EventTypeSeparator: | |||
There was a problem hiding this comment.
would it make sense to change the type in Event?
There was a problem hiding this comment.
Possibly. I think at one point I tried to implement the tcglog-parser library without a dependency on go-tpm2, with it's own types and constants for digest algorithms as well, but it's had a dependency on it for a while now so it doesn't make much sense to keep the tcglog.PCRIndex type. I'll fix that up separately.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 changes a few types, replaces pcrProfileFlags with pcrFlags
and introduces a PCRProfileEnablePCRsOption interface which is
implemented by the existing profile options and will be implemented by
a new composite option returned by the detection code.