Changeset 95697 in vbox

Timestamp:

Jul 18, 2022 9:47:14 AM (2 years ago)

Author:

vboxsync

Message:

Windows Additions/Installer: Added VBoxCertUtil + legacy TS CA cert to the installer in case VBOX_SIGN_ADDITIONS and VBOX_WITH_VBOX_LEGACY_TS_CA are set. This then will be utilized by the installer automatically to install the certificate as a pre-requisite for guest OSes < Windows 10 (using the PreW10 .cat files). bugref:8691

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -206 +206 @@
                 -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
+                        $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
                         $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
@@ -255 +256 @@
                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
+                        $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
                         $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -167 +167 @@
   ; Delete old VBoxService.exe from install directory (replaced by VBoxTray.exe)
   Delete /REBOOTOK "$INSTDIR\VBoxService.exe"
+
+!ifdef VBOX_SIGN_ADDITIONS && VBOX_WITH_VBOX_LEGACY_TS_CA
+  ; On guest OSes < Windows 10 we always go for the PreW10 drivers and install our legacy timestamp CA.
+  ${If} $g_strWinVersion != "10"
+    ${LogVerbose} "Installing legacy timestamp CA certificate ..."
+    SetOutPath "$INSTDIR\cert"
+    FILE "$%PATH_OUT%\bin\additions\vbox-legacy-timestamp-ca.cer"
+    FILE "$%PATH_OUT%\bin\additions\VBoxCertUtil.exe"
+    ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" add-trusted-publisher $\"$INSTDIR\cert\vbox-legacy-timestamp-ca.cer$\"" "false"
+    ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" display-all" "false"
+  ${EndIf}
+!endif
 
 FunctionEnd