fixup! overlord/fdestate/fdestate.go: use HashAlg type from secboot

canonical · Nov 5, 2024 · 505073e · 505073e
1 parent d6a7b55
commit 505073e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/overlord/fdestate/fdemgr.go b/overlord/fdestate/fdemgr.go
@@ -69,13 +69,11 @@ func Manager(st *state.State, runner *state.TaskRunner) (*FDEManager, error) {
 		preseed: snapdenv.Preseeding(),
 	}
 
-	if secboot.WithSecbootSupport {
-		boot.ResealKeyForBootChains = m.resealKeyForBootChains
+	boot.ResealKeyForBootChains = m.resealKeyForBootChains
 
-		if !m.preseed {
-			if err := initModeFromModeenv(m); err != nil {
-				return nil, err
-			}
+	if secboot.WithSecbootSupport && !m.preseed {
+		if err := initModeFromModeenv(m); err != nil {
+			return nil, err
 		}
 	}
 

diff --git a/overlord/fdestate/fdemgr_test.go b/overlord/fdestate/fdemgr_test.go
@@ -312,6 +312,10 @@ func (s *fdeMgrSuite) testMountResolveError(c *C, tc mountResolveTestCase) {
 }
 
 func (s *fdeMgrSuite) TestStateInitMountResolveError_StatePresentNoError(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	s.st.Lock()
 	s.st.Set("fde", fdestate.FdeState{})
 	s.st.Unlock()
@@ -325,27 +329,42 @@ func (s *fdeMgrSuite) TestStateInitMountResolveError_StatePresentNoError(c *C) {
 }
 
 func (s *fdeMgrSuite) TestStateInitMountResolveError_NoDataNoSaveNoError(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	s.testMountResolveError(c, mountResolveTestCase{
 		dataResolveErr: disks.ErrNoDmUUID,
 		saveResolveErr: disks.ErrNoDmUUID,
 	})
 }
 
 func (s *fdeMgrSuite) TestStateInitMountResolveError_NoDataFails(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	s.testMountResolveError(c, mountResolveTestCase{
 		dataResolveErr: fmt.Errorf("mock error data"),
 		expectedError:  "cannot initialize FDE state: cannot resolve data partition mount: mock error data",
 	})
 }
 
 func (s *fdeMgrSuite) TestStatetInitMountResolveError_NoSaveFails(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
 	s.testMountResolveError(c, mountResolveTestCase{
 		saveResolveErr: fmt.Errorf("mock error save"),
 		expectedError:  "cannot initialize FDE state: cannot resolve save partition mount: mock error save",
 	})
 }
 
 func (s *fdeMgrSuite) TestStateInitMountResolveError_Recover(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	m := boot.Modeenv{
 		Mode:           boot.ModeRecover,
 		RecoverySystem: "1234",
@@ -361,6 +380,10 @@ func (s *fdeMgrSuite) TestStateInitMountResolveError_Recover(c *C) {
 }
 
 func (s *fdeMgrSuite) TestMountResolveError_FactoryReset(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	m := boot.Modeenv{
 		Mode:           boot.ModeFactoryReset,
 		RecoverySystem: "1234",
@@ -389,6 +412,10 @@ func (s *fdeMgrSuite) TestManagerUC_16_18(c *C) {
 }
 
 func (s *fdeMgrSuite) TestManagerPreseeding(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
+
 	defer snapdenv.MockPreseeding(true)()
 
 	manager, err := fdestate.Manager(s.st, s.runner)

diff --git a/overlord/managers_test.go b/overlord/managers_test.go
@@ -7851,6 +7851,9 @@ func (s *mgrsSuiteCore) testRemodelUC20WithRecoverySystem(c *C, encrypted bool)
 }
 
 func (s *mgrsSuiteCore) TestRemodelUC20WithRecoverySystemEncrypted(c *C) {
+	if !secboot.WithSecbootSupport {
+		c.Skip("secboot is not available")
+	}
 	const encrypted bool = true
 	s.testRemodelUC20WithRecoverySystem(c, encrypted)
 }