Changeset 95753 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Jul 20, 2022 12:20:35 PM (3 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Added switches /[no_]install_timestamp_ca to (not) force installation of the timestamp CA. Note: When not specified explicitly, this does not change the default behaviour of only installing the CA only on guests < Windows 10. bugref:8691

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (3 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -244 +244 @@
 Var g_bOnlyExtract                      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
 Var g_bPostInstallStatus                ; Cmd line: Post the overall installation status to some external program (VBoxTray)
+Var g_bInstallTimestampCA               ; Cmd line: Force installing the timestamp CA on the system
 
 ; Platform parts of this installer
@@ -365 +366 @@
         ${Break}
 !endif
+
+      ${Case} '/install_timestamp_ca' ; Not officially documented
+        StrCpy $g_bInstallTimestampCA "true"
+        ${Break}
+
+      ${Case} '/no_install_timestamp_ca' ; Ditto
+        StrCpy $g_bInstallTimestampCA "false"
+        ${Break}
 
       ${Case} '/reboot'
@@ -939 +948 @@
   StrCpy $g_bCapWDDM "false"
   StrCpy $g_bPostInstallStatus "false"
+  StrCpy $g_bInstallTimestampCA "unset" ; Tri-state: "unset", "true" and "false"
 
   ; We need a special directory set to SysWOW64 because some

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

@@ -169 +169 @@
 
 !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"
+  ; NSIS only supports global vars, even in functions -- great
+  Var /GLOBAL bDoInstallCA
+  StrCpy $bDoInstallCA "false" ; Set a default value
+
+  ; If not explicitly specified, let the detected Windows version decide what to do.
+  ${If} $g_bInstallTimestampCA == 'unset':
+    ${If} $g_strWinVersion != "10"
+      ; On guest OSes < Windows 10 we always go for the PreW10 drivers and install our legacy timestamp CA.
+      StrCpy $bDoInstallCA "true"
+    ${EndIf}
+  ${Else}
+    StrCpy $bDoInstallCA $g_bInstallTimestampCA
+  ${EndIf}
+
+  ${If} $bDoInstallCA == "true"
     ${LogVerbose} "Installing legacy timestamp CA certificate ..."
     SetOutPath "$INSTDIR\cert"