Changeset 95696 in vbox

Timestamp:

Jul 18, 2022 9:07:10 AM (2 years ago)

Author:

vboxsync

Message:

Installer/win/VBoxStub: Install the legacy windows timestamp CA if used by the build and needed by the install target. bugref:8691

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxStub.cpp (modified) (2 diffs)

trunk/src/VBox/Installer/win/Stub/Makefile.kmk

@@ -67 +67 @@
  VBoxStub.cpp_INCS += $(VBoxStub_0_OUTDIR)
  VBoxStub.cpp_DEFS += VBOX_WITH_CODE_SIGNING
+ ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
+  VBoxStub.cpp_DEFS += VBOX_WITH_VBOX_LEGACY_TS_CA
+ endif
 
  $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h:  | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(PATH_STAGE_SYS)/VBoxSup.sys
@@ -92 +95 @@
               "};"
         $(RM) -f -- "[email protected]" "[email protected]" "[email protected]" "[email protected]"
+ ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
+        $(VBOX_BIN2C) -ascii --append VBoxLegacyWinCA "$(VBOX_LEGACY_TS_CA_FILE)" $@
+ endif
 
  VBoxStubPublicCert.h:: $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -49 +49 @@
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 #include <iprt/thread.h>
 #include <iprt/utf16.h>
@@ -822 +823 @@
             return ShowError("Failed to construct install certificate.");
     }
+
+# ifdef VBOX_WITH_VBOX_LEGACY_TS_CA
+    if (   RTSystemGetNtVersion() < RTSYSTEM_MAKE_NT_VERSION(10, 0, 0)
+        || false /** @todo windows server 2016 and later */ )
+    {
+        if (!addCertToStore(CERT_SYSTEM_STORE_LOCAL_MACHINE, "Root", g_abVBoxLegacyWinCA, sizeof(g_abVBoxLegacyWinCA)))
+            return ShowError("Failed to construct install certificate.");
+    }
+# endif
     return RTEXITCODE_SUCCESS;
 }