Changeset 106247 in vbox for trunk/src

Timestamp:

Oct 8, 2024 9:50:21 PM (7 weeks ago)

Author:

vboxsync

Message:

Additions/NT/Installer,Config.kmk: Use the same signing commands for the additions installer and uninstaller image as for signing all other executables. VBOX_SIGN_FILE_FN would work differently from VBOX_SIGN_IMAGE_FN when corp signing plans b & c. This caused trouble when the installer loader stub compared its signature with that of the actual installers or the build certificate. bugref:10771

File:

• trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (3 diffs)

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

@@ -316 +316 @@
                 $(if $(VBOX_WIN_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
                 $(VBOX_VERSION_STAMP) \
-                $$(VBoxDrvInst_1_STAGE_TARGET)
+                $$(VBoxDrvInst_1_STAGE_TARGET) \
+                | $(VBOX_SIGN_IMAGE_ORDERDEPS)
         $(call MSG_L1,Creating $@, from $<)
-ifdef VBOX_WIN_ATTESTATION_SIGNING # Unpack the attestation signed drivers - this is an ugly has 'ing heck hack!
+ifdef VBOX_WIN_ATTESTATION_SIGNING # Unpack the attestation signed drivers - this is an ugly as 'ing heck hack!
         $(TOOL_ZIP_UNPACK) -oj $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) -d $(PATH_STAGE_BIN)/additions/
 endif
@@ -332 +333 @@
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
                         '$(subst /,\,$<)'
-        $(call VBOX_SIGN_FILE_FN,$@)
+        $(call VBOX_SIGN_IMAGE_FN,$@)
 
 
@@ -378 +379 @@
                         '$(subst /,\,$<)'
 
- $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
+ $(PATH_TARGET)/uninst.exe: \
+                $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@) $(VBOX_SIGN_IMAGE_ORDERDEPS)
         $(call MSG_L1,Creating $@, from $<)
         $(QUIET)$(RM) -f $@
         -$(REDIRECT) -E __COMPAT_LAYER=RUNASINVOKER -- $<
         $(TEST) -f $@
-        $(call VBOX_SIGN_FILE_FN,$@)
+        $(call VBOX_SIGN_IMAGE_FN,$@)
 
 endif # VBOX_SIGNING_MODE