Merge remote-tracking branch 'origin/pull/419'

* origin/pull/419: fixup: builtin.go fixup: setup_test.go
Foxboron · Mar 1, 2025 · c74a6a3 · c74a6a3
2 parents 4386be4 + b7a1c77
commit c74a6a3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/certs/builtin.go b/certs/builtin.go
@@ -11,7 +11,12 @@ import (
 )
 
 var (
-	efiGlobalGuid                 = util.EFIGUID{0x8be4df61, 0x93ca, 0x11d2, [8]uint8{0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c}}
+	efiGlobalGuid = util.EFIGUID{
+	Data1: 0x8be4df61,
+	Data2: 0x93ca,
+	Data3: 0x11d2,
+	Data4: [8]uint8{0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c},
+	}
 	defaultSignatureDatabaseNames = map[string]string{
 		"db":  "dbDefault",
 		"KEK": "KEKDefault",

diff --git a/cmd/sbctl/setup_test.go b/cmd/sbctl/setup_test.go
@@ -39,8 +39,14 @@ func TestSetup(t *testing.T) {
 
 	// Include test file into our file config
 	conf.Files = []*config.FileConfig{
-		{"/boot/test.efi", "/boot/new.efi"},
-		{"/boot/something.efi", ""},
+	    {
+	        Path:   "/boot/test.efi",
+	        Output: "/boot/new.efi",
+	    },
+	    {
+	        Path:   "/boot/something.efi",
+	        Output: "",
+	    },
 	}
 
 	state := &config.State{
@@ -136,8 +142,14 @@ func TestSetupTPMKeys(t *testing.T) {
 
 	// Include test file into our file config
 	conf.Files = []*config.FileConfig{
-		{"/boot/test.efi", "/boot/new.efi"},
-		{"/boot/something.efi", ""},
+	    {
+	        Path:   "/boot/test.efi",
+	        Output: "/boot/new.efi",
+	    },
+	    {
+	        Path:   "/boot/something.efi",
+	        Output: "",
+	    },
 	}
 
 	rwc, err := simulator.OpenSimulator()