VirtualBox

Changeset 77766 in vbox for trunk


Ignore:
Timestamp:
Mar 18, 2019 5:38:34 PM (6 years ago)
Author:
vboxsync
Message:

Config.kmk: Change VBOX_WITH_CORP_CODE_SIGNING to be a set of platforms (or "all") on which corp code signing should be enabled. This way it can be controlled selectively with the complicated staged builds (additions etc.) with a single LocalConfig.kmk.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r77352 r77766  
    35133513  # @param 6  non-zero for alternative command separator.  This is used for generating repacking scripts.
    35143514  ifndef VBOX_SIGN_FILE_FN
    3515    ifeq ($(VBOX_WITH_CORP_CODE_SIGNING),all)
    3516     VBOX_SIGN_FILE_FN     = $(call VBOX_CCS_SIGN_CMD,driver,$1,$(dir $1))
     3515   if $(intersects win all,$(VBOX_WITH_CORP_CODE_SIGNING))
     3516    VBOX_SIGN_FILE_FN     = $(call VBOX_CCS_SIGN_CMD,driver$(if-expr "$3" == "/ph",_pagehash,),$1,$(dir $1),-digest_algo SHA1) \
     3517        $(if-expr "$5" == "",\
     3518         $(if-expr "$6" == "",$(if-expr "$4" == "2",$$(NLTAB),$(NLTAB)),$6)$(call VBOX_CCS_SIGN_CMD, \
     3519          driver$(if-expr "$3" == "/ph",_pagehash,),$1,$(dir $1),-digest_algo SHA1))
    35173520   else ifdef VBOX_CERTIFICATE_SHA2_SUBJECT_NAME
    35183521    VBOX_SIGN_FILE_FN     = $(VBOX_SIGNTOOL) \
    … …  
    35923595
    35933596  ## Commands for signing a driver image after link.
    3594   if defined(VBOX_WITH_CORP_CODE_SIGNING) && "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all"
     3597  if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    35953598   VBOX_SIGN_DRIVER_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_SIGN_IMAGE_PLAN_B_FN,$(out),,/ph,2))
    35963599   VBOX_SIGN_DRIVER_ORDERDEPS ?= $(VBOX_RTSIGNTOOL)
    … …  
    36083611        $(NL)$(TAB)$(VBOX_INF2CAT) "/driver:$(strip $(1))" "/os:$(strip $(subst ;,$(COMMA),$(3)))" /verbose \
    36093612        $(NL)$(TAB)$(MV) -- "$(2)" "$(2)"
    3610    if defined(VBOX_WITH_CORP_CODE_SIGNING) && "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all"
     3613   if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    36113614    VBOX_MAKE_CAT_HLP_FN += $(NL)$(TAB)$(call VBOX_SIGN_IMAGE_PLAN_B_FN,$(2),,,$(NL)$(TAB))
    36123615   else
    … …  
    36593662  # @param 2  Identifier, optional.
    36603663  # @param 3  Additional codesign command line parameters, optional.
    3661   ifdef VBOX_WITH_CORP_CODE_SIGNING
     3664  if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    36623665   ## @todo cannot handle $(2), the identifier. $(3) is hopefully either empty or --deep
    36633666   VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
    … …  
    36803683  # @param 1  The file to sign.
    36813684  # @param 2  Identifier, optional.
    3682   ifdef VBOX_WITH_CORP_CODE_SIGNING
     3685  if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    36833686   ## @todo cannot handle $(2), the identifier.
    36843687   VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1))
    … …  
    37023705  # @param 1  The file to sign.
    37033706  # @param 2  Identifier, optional.
    3704   ifdef VBOX_WITH_CORP_CODE_SIGNING
     3707  if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    37053708   ## @todo cannot handle $(2), the identifier.
    37063709   VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1))
    … …  
    37243727  # @param 1  The file to sign.
    37253728  # @param 2  Identifier, optional.
    3726   ifdef VBOX_WITH_CORP_CODE_SIGNING
     3729  if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    37273730   ## @todo cannot handle $(2), the identifier.
    37283731   VBOX_SIGN_PKG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,mac_pkg,$(1))
    … …  
    37993802
    38003803  ## Commands for signing a driver image after link.
    3801   ifdef VBOX_WITH_CORP_CODE_SIGNING
     3804  if $(intersects solaris all,$(VBOX_WITH_CORP_CODE_SIGNING))
    38023805   VBOX_SIGN_DRIVER_CMDS ?= $(if $(eq $(tool_do),LINK_LIBRARY),,$(call VBOX_CCS_SIGN_CMD,solaris_elf,$(out)))
    38033806  else

  • trunk/src/VBox/Additions/Makefile.kmk

    r76553 r77766  
    283283 ifndef VBOX_SIGNING_MODE
    284284  GUESTADDITIONS_FILESPEC.win =
    285  else if "$(VBOX_WITH_CORP_CODE_SIGNING)" == "all" || (!defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && !defined(VBOX_WITH_CORP_CODE_SIGNING))
     285 else if !defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && !$(intersects win all,$(VBOX_WITH_CORP_CODE_SIGNING))
    286286  GUESTADDITIONS_FILESPEC.win = cert/vbox.cer=$(VBOX_PATH_ADDITIONS.win)/vbox.cer
    287287 else
    … …  
    289289        cert/vbox-sha1.cer=$(VBOX_PATH_ADDITIONS.win)/vbox-sha1.cer \
    290290        cert/vbox-sha256.cer=$(VBOX_PATH_ADDITIONS.win)/vbox-sha256.cer
    291   if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && defined(VBOX_WITH_CORP_CODE_SIGNING)
     291  if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    292292   GUESTADDITIONS_FILESPEC.win += cert/vbox-sha256-r3.cer=$(VBOX_PATH_ADDITIONS.win)/vbox-sha256-r3.cer
    293293  endif

  • trunk/src/VBox/Additions/WINNT/tools/Makefile.kmk

    r76553 r77766  
    5858 endef
    5959
    60  if "$(VBOX_WITH_CORP_CODE_SIGNING)" == "all" || (!defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && !defined(VBOX_WITH_CORP_CODE_SIGNING))
     60 if !defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && !$(intersects win all,$(VBOX_WITH_CORP_CODE_SIGNING))
    6161  $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox.cer,$(VBOX_PATH_ADDITIONS)/VBoxGuest.sys,0)
    6262 else
    6363  $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox-sha1.cer,$(VBOX_PATH_ADDITIONS)/VBoxGuest.sys,0)
    6464  $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox-sha256.cer,$(VBOX_PATH_ADDITIONS)/VBoxGuest.sys,1)
    65   if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && defined(VBOX_WITH_CORP_CODE_SIGNING)
     65  if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    6666   $(evalcall2 def_VBoxAdditionsInstCertFiles,vbox-sha256-r3.cer,$(VBOX_PATH_ADDITIONS)/VBoxCertUtil.exe,1)
    6767  endif

  • trunk/src/VBox/Installer/darwin/Makefile.kmk

    r76866 r77766  
    241241                $@
    242242ifdef VBOX_SIGNING_MODE
    243  ifdef VBOX_WITH_CORP_CODE_SIGNING
     243 if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    244244        @# Sign the created pkg.
    245245        $(call VBOX_SIGN_PKG_FN,$@,org.VirtualBox.mpkg.virtualbox)
    … …  
    333333                $@
    334334ifdef VBOX_SIGNING_MODE
    335  ifdef VBOX_WITH_CORP_CODE_SIGNING
     335 if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    336336        @# Sign the created pkg.
    337337        $(call VBOX_SIGN_PKG_FN,$@,org.virtualbox.pkg.vboxkexts)
    … …  
    814814                $@
    815815ifdef VBOX_SIGNING_MODE
    816  ifdef VBOX_WITH_CORP_CODE_SIGNING
     816 if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    817817        @# Sign the created pkg.
    818818        $(call VBOX_SIGN_PKG_FN,$@,org.virtualbox.pkg.virtualbox)
    … …  
    901901                $@
    902902ifdef VBOX_SIGNING_MODE
    903  ifdef VBOX_WITH_CORP_CODE_SIGNING
     903 if $(intersects darwin all,$(VBOX_WITH_CORP_CODE_SIGNING))
    904904        @# Sign the created pkg.
    905905        $(call VBOX_SIGN_PKG_FN,$@,org.virtualbox.pkg.virtualboxcli)

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

    r76553 r77766  
    6363        $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert0 "[email protected]" $@
    6464        $(APPEND) "[email protected]" "    { g_abVBoxStubTrustedCert0, sizeof(g_abVBoxStubTrustedCert0) }, "
    65   if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) && (!defined(VBOX_WITH_CORP_CODE_SIGNING) || "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all")
     65  if defined(VBOX_CERTIFICATE_SHA2_SUBJECT_NAME) || $(intersects win all,$(VBOX_WITH_CORP_CODE_SIGNING))
    6666        $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --signature-index 1 --exe "$(PATH_STAGE_SYS)/VBoxDrv.sys" --output "[email protected]" --der
    6767        $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert1 "[email protected]" $@
    6868        $(APPEND) "[email protected]" "    { g_abVBoxStubTrustedCert1, sizeof(g_abVBoxStubTrustedCert1) }, "
    6969  endif
    70   if defined(VBOX_WITH_CORP_CODE_SIGNING) && "$(VBOX_WITH_CORP_CODE_SIGNING)" != "all" && "$(VBOX_SIGNING_MODE)" == "release"
     70  if $(intersects win_planb,$(VBOX_WITH_CORP_CODE_SIGNING))
    7171        $(VBOX_RTSIGNTOOL) extract-exe-signer-cert --signature-index 1 --exe "$(VBOX_RTSIGNTOOL)" --output "[email protected]" --der
    7272        $(VBOX_BIN2C) -ascii --append VBoxStubTrustedCert2 "[email protected]" $@
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette