Skip to content

Fix bgheader parser, add multiversion detection #397

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

Merged
orangecms merged 2 commits into from
Jan 12, 2023
Merged

Fix bgheader parser, add multiversion detection #397

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9a4afc
parse entire struct
zaolin Jan 12, 2023
9c764ce
Switch to variable detection range
zaolin Jan 12, 2023
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
15 changes: 5 additions & 10 deletions pkg/intel/metadata/common/bgheader/bgheader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,15 @@ func (bgv BootGuardVersion) String() string {

func DetectBGV(r io.Reader) (BootGuardVersion, error) {
var s structInfo
err := binary.Read(r, binaryOrder, s.ID[:])
err := binary.Read(r, binaryOrder, &s)
if err != nil {
return 0, fmt.Errorf("unable to read field 'ID': %w", err)
}
err = binary.Read(r, binaryOrder, s.Version)
if err != nil {
return 0, fmt.Errorf("unable to read field 'Version': %w", err)
}
switch s.Version {
case 0x10:
return Version10, nil
case 0x20:
if s.Version >= 0x20 {
return Version20, nil
default:
} else if (s.Version < 0x20) && (s.Version >= 0x10) {
return Version10, nil
} else {
return 0, fmt.Errorf("couldn't detect version")
}
}