diff options
| -rw-r--r-- | secboot/secboot_tpm.go | 1 | ||||
| -rw-r--r-- | secboot/secboot_tpm_test.go | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/secboot/secboot_tpm.go b/secboot/secboot_tpm.go index 330f1f757f..2b4206da2f 100644 --- a/secboot/secboot_tpm.go +++ b/secboot/secboot_tpm.go @@ -860,7 +860,6 @@ func efiImageFromBootFile(b *bootloader.BootFile) (sb.EFIImage, error) { } return sb.SnapFileEFIImage{ Container: snapf, - Path: b.Snap, FileName: b.Path, }, nil } diff --git a/secboot/secboot_tpm_test.go b/secboot/secboot_tpm_test.go index 9684e0c634..9db5c2de5b 100644 --- a/secboot/secboot_tpm_test.go +++ b/secboot/secboot_tpm_test.go @@ -585,7 +585,7 @@ func (s *secbootSuite) TestEFIImageFromBootFile(c *C) { { // happy case for snap file bootFile: bootloader.NewBootFile(snapFile, "rel", bootloader.RoleRecovery), - efiImage: sb.SnapFileEFIImage{Container: snapf, Path: snapFile, FileName: "rel"}, + efiImage: sb.SnapFileEFIImage{Container: snapf, FileName: "rel"}, }, { // invalid snap file @@ -731,7 +731,6 @@ func (s *secbootSuite) TestSealKey(c *C) { Source: sb.Shim, Image: sb.SnapFileEFIImage{ Container: kernelSnap, - Path: mockBF[4].Snap, FileName: "kernel.efi", }, }, @@ -751,7 +750,6 @@ func (s *secbootSuite) TestSealKey(c *C) { Source: sb.Shim, Image: sb.SnapFileEFIImage{ Container: kernelSnap, - Path: mockBF[4].Snap, FileName: "kernel.efi", }, }, @@ -765,7 +763,6 @@ func (s *secbootSuite) TestSealKey(c *C) { Source: sb.Shim, Image: sb.SnapFileEFIImage{ Container: kernelSnap, - Path: mockBF[4].Snap, FileName: "kernel.efi", }, }, @@ -1082,7 +1079,7 @@ func createMockSnapFile(snapDir, snapPath, snapType string) (snap.Container, err } func mockSbTPMConnection(c *C, tpmErr error) (*sb.TPMConnection, func()) { - tcti, err := os.Open("/dev/null") + tcti, err := tpm2.OpenTPMDevice("/dev/null") c.Assert(err, IsNil) tpmctx, err := tpm2.NewTPMContext(tcti) c.Assert(err, IsNil) |