Changeset 104794 in vbox for trunk/src/VBox/Main

Timestamp:

May 27, 2024 7:17:25 PM (6 months ago)

Author:

vboxsync

Message:

Main: Actually add new Microsoft KEK cert issued 2023, was forgotten in previous change. bugref:10699

Location:

trunk/src/VBox/Main

Files:

• include/TrustAnchorsAndCerts.h (modified) (1 diff)
• src-server/UefiVariableStoreImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/TrustAnchorsAndCerts.h

@@ -39 +39 @@
 extern const unsigned g_cbUefiMicrosoftKek;
 
+extern const unsigned char g_abUefiMicrosoftKek2023[];
+extern const unsigned g_cbUefiMicrosoftKek2023;
+
 extern const unsigned char g_abUefiMicrosoft3rdCa[];
 extern const unsigned g_cbUefiMicrosoft3rdCa;

trunk/src/VBox/Main/src-server/UefiVariableStoreImpl.cpp

@@ -533 +533 @@
     if (SUCCEEDED(hrc))
     {
-        hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoft3rdCa, g_cbUefiMicrosoft3rdCa,
+        hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidGlobalVar, "KEK", g_abUefiMicrosoftKek2023, g_cbUefiMicrosoftKek2023,
                                              GuidMs, SignatureType_X509);
         if (SUCCEEDED(hrc))
         {
-            hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoft3rdCa2023, g_cbUefiMicrosoft3rdCa2023,
+            hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoft3rdCa, g_cbUefiMicrosoft3rdCa,
                                                  GuidMs, SignatureType_X509);
             if (SUCCEEDED(hrc))
             {
-                hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoftWinCa, g_cbUefiMicrosoftWinCa,
+                hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoft3rdCa2023, g_cbUefiMicrosoft3rdCa2023,
                                                      GuidMs, SignatureType_X509);
                 if (SUCCEEDED(hrc))
-                    hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoftWinCa2023, g_cbUefiMicrosoftWinCa2023,
+                {
+                    hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoftWinCa, g_cbUefiMicrosoftWinCa,
                                                          GuidMs, SignatureType_X509);
+                    if (SUCCEEDED(hrc))
+                        hrc = i_uefiVarStoreAddSignatureToDb(&EfiGuidSecurityDb, "db", g_abUefiMicrosoftWinCa2023, g_cbUefiMicrosoftWinCa2023,
+                                                             GuidMs, SignatureType_X509);
+                }
             }
         }