Changeset 83077 in vbox

Timestamp:

Feb 14, 2020 4:00:59 PM (5 years ago)

Author:

vboxsync

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

136125

Message:

/Config.kmk, Installer/darwin: add support for automated notarization with CCS

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3702 +3702 @@
   endif
 
+  ##
+  # Corp Code Notarization command line. Modifies the file because the tickets are stapled.
+  # @param 1  The file to be submitted for signing.
+  # @param 2  Identifier, mandatory.
+  # @param 3  The directory to put the notarized file in. Defaults to $(dir $1).
+ VBOX_CCS_NOTARIZE_CMD = $(VBOX_RETRY) $(VBOX_JAVA) -jar "$(VBOX_CCS_CLIENT_JAR)" \
+        mac_notarize -user "$(VBOX_CCS_USER)" -global_uid "$(VBOX_CCS_GLOBAL_UID)" \
+                -job_timeout 90 -server_timeout 75 -server "$(VBOX_CCS_SERVER)" \
+                -file_to_notarize "$1" -bundle_id "$2" -download_location "$(if $3,$3,$(dir $2))"
+
   ## Sign an application bundle, framework or kernel extension.
   # @param 1  The bundle to sign.
@@ -3787 +3797 @@
    ## @todo cannot handle $(2), the identifier.
    VBOX_SIGN_PKG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,mac_pkg,$(1))
+  endif
+
+  ## Notarize a file (usually DMG, can also be PKG). Used with corp code signing only.
+  # @param 1  The file to notarize.
+  # @param 2  Identifier, mandatory.
+  if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
+   VBOX_NOTARIZE_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_NOTARIZE_CMD,$(1),$(2))
   endif
 

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

@@ -165 +165 @@
         @# Sign the created dmg.
         $(call VBOX_SIGN_DMG_FN,$@,org.virtualbox.dmg)
+  if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))
+        @# Notarize the signed dmg (includes stapling).
+        $(call VBOX_NOTARIZE_FILE_FN,$@,org.virtualbox.VirtualBox.$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD).$(VBOX_SVN_REV))
+  endif
  endif
 endif