Changeset 96799 in vbox

Timestamp:

Sep 20, 2022 8:46:08 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10293: A bit of fixes for Secure Boot option saving done in r153684; Side-case assertion fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -997 +997 @@
         }
         /* Save whether secure boot is enabled: */
-        if (   fSuccess && isMachineOffline() && newSystemData.m_fEnabledEFI
-            && newSystemData.m_fEnabledSecureBoot != oldSystemData.m_fEnabledSecureBoot)
+        if (fSuccess && isMachineOffline() && newSystemData.m_fEnabledSecureBoot != oldSystemData.m_fEnabledSecureBoot)
         {
             CNvramStore comStoreLvl1 = m_machine.GetNonVolatileStore();
             CUefiVariableStore comStoreLvl2 = comStoreLvl1.GetUefiVariableStore();
+
+            /* Enabling secure boot? */
             if (   newSystemData.m_fEnabledSecureBoot
-                && !newSystemData.m_fAvailableSecureBoot)
+                && newSystemData.m_fEnabledEFI)
             {
-                comStoreLvl1.InitUefiVariableStore(0);
-                comStoreLvl2 = comStoreLvl1.GetUefiVariableStore();
-                comStoreLvl2.EnrollOraclePlatformKey();
-                comStoreLvl2.EnrollDefaultMsSignatures();
+                /* Secure boot was NOT available? */
+                if (!newSystemData.m_fAvailableSecureBoot)
+                {
+                    /* Init and enroll everything: */
+                    comStoreLvl1.InitUefiVariableStore(0);
+                    comStoreLvl2 = comStoreLvl1.GetUefiVariableStore();
+                    comStoreLvl2.EnrollOraclePlatformKey();
+                    comStoreLvl2.EnrollDefaultMsSignatures();
+                }
+                comStoreLvl2.SetSecureBootEnabled(true);
+                fSuccess = comStoreLvl2.isOk();
+                /// @todo convey error info ..
             }
-            comStoreLvl2.SetSecureBootEnabled(newSystemData.m_fEnabledSecureBoot);
-            fSuccess = comStoreLvl2.isOk();
-            /// @todo convey error info ..
+            /* Disabling secure boot? */
+            else if (!newSystemData.m_fEnabledSecureBoot)
+            {
+                comStoreLvl2.SetSecureBootEnabled(false);
+                fSuccess = comStoreLvl2.isOk();
+                /// @todo convey error info ..
+            }
         }