Changeset 95679 in vbox

Timestamp:

Jul 17, 2022 2:44:39 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152328

Message:

/Config.kmk: Try separate sha1 and sha256 signtools. bugref:8691

File:

• trunk/Config.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -3969 +3969 @@
   endif
 
-  VBOX_SIGNTOOL ?= $(VBOX_RETRY) "$(VBOX_PATH_SIGN_TOOLS)/signtool.exe"
-  VBOX_INF2CAT  ?= $(VBOX_PATH_SELFSIGN)/inf2cat.exe
+  VBOX_SIGNTOOL                ?= $(VBOX_RETRY) "$(VBOX_PATH_SIGN_TOOLS)/signtool.exe"
+  VBOX_SIGNTOOL_ORDERDEPS      ?=
+  VBOX_SIGNTOOL_SHA1           ?= $(VBOX_SIGNTOOL)
+  VBOX_SIGNTOOL_SHA1_ORDERDEPS ?= $(VBOX_SIGNTOOL_ORDERDEPS)
+  VBOX_SIGNTOOL_SHA2           ?= $(VBOX_SIGNTOOL)
+  VBOX_SIGNTOOL_SHA2_ORDERDEPS ?= $(VBOX_SIGNTOOL_ORDERDEPS)
+  VBOX_INF2CAT                 ?= $(VBOX_PATH_SELFSIGN)/inf2cat.exe
 
   ifeq ($(VBOX_SIGNING_MODE),test)
@@ -4045 +4050 @@
    else ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
     ifdef VBOX_CERTIFICATE_SUBJECT_NAME
-     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) \
+     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL_SHA1) \
         sign /fd sha1 \
         $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \
@@ -4056 +4061 @@
         "$(1)" \
         $(if-expr "$5" == "",\
-        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6)$(VBOX_SIGNTOOL) \
+        $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6)$(VBOX_SIGNTOOL_SHA2) \
         sign /as /fd sha256 \
         $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
@@ -4067 +4072 @@
         "$(1)",)
     else
-     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) \
+     VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL_SHA2) \
         sign /fd sha256 \
         $(VBOX_CROSS_CERTIFICATE_SHA2_FILE_ARGS) \
@@ -4099 +4104 @@
     VBOX_SIGN_EV_FILE_FN  = $(call VBOX_CCS_SIGN_CMD,microsoftev,$1,$(if $2,$2,))
    else ifdef VBOX_CERTIFICATE_EV_SUBJECT_NAME
-    VBOX_SIGN_EV_FILE_FN  = $(VBOX_SIGNTOOL) \
+    VBOX_SIGN_EV_FILE_FN  = $(VBOX_SIGNTOOL_SHA2) \
         sign /fd sha256 \
         $(VBOX_CERTIFICATE_EV_STORE_ARGS) \
@@ -4157 +4162 @@
   #
   # @remarks The parameters are the same as VBOX_SIGN_FILE_FN.
-  VBOX_SIGN_IMAGE_PLAN_B_FN = $(VBOX_SIGNTOOL) \
+  VBOX_SIGN_IMAGE_PLAN_B_FN = $(VBOX_SIGNTOOL_SHA1) \
         sign /fd sha1\
         $(VBOX_CROSS_CERTIFICATE_FILE_ARGS) \