From 350be0cc3025f133a0a81533188c81ac26d624e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 20 Jun 2024 06:01:56 +0200 Subject: Merging upstream version 127.0.1. Signed-off-by: Daniel Baumann --- taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py | 2 +- taskcluster/gecko_taskgraph/transforms/openh264_signing.py | 2 +- taskcluster/gecko_taskgraph/transforms/repackage_signing.py | 8 ++++---- .../gecko_taskgraph/transforms/repackage_signing_partner.py | 4 ++-- taskcluster/gecko_taskgraph/util/signed_artifacts.py | 4 ++-- taskcluster/kinds/repackage-msix/kind.yml | 4 ++-- taskcluster/kinds/repackage-shippable-l10n-msix/kind.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'taskcluster') diff --git a/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py b/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py index 95b8d3dd54..25f861e662 100644 --- a/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py @@ -121,7 +121,7 @@ def make_signing_description(config, jobs): def _craft_upstream_artifacts(dep_job, dependency_kind, build_platform): if build_platform.startswith("win"): - signing_format = "autograph_authenticode_sha2" + signing_format = "autograph_authenticode_202404" elif build_platform.startswith("linux"): signing_format = "autograph_gpg" elif build_platform.startswith("macosx"): diff --git a/taskcluster/gecko_taskgraph/transforms/openh264_signing.py b/taskcluster/gecko_taskgraph/transforms/openh264_signing.py index 00a55dad41..74aebbd90b 100644 --- a/taskcluster/gecko_taskgraph/transforms/openh264_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/openh264_signing.py @@ -81,7 +81,7 @@ def make_signing_description(config, jobs): } if "win" in build_platform: - upstream_artifact["formats"] = ["autograph_authenticode_sha2"] + upstream_artifact["formats"] = ["autograph_authenticode_202404"] elif "mac" in build_platform: upstream_artifact["formats"] = ["mac_single_file"] upstream_artifact["singleFileGlobs"] = ["libgmpopenh264.dylib"] diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing.py index 66c1f87d70..d4106efb29 100644 --- a/taskcluster/gecko_taskgraph/transforms/repackage_signing.py +++ b/taskcluster/gecko_taskgraph/transforms/repackage_signing.py @@ -29,10 +29,10 @@ repackage_signing_description_schema = Schema( ) SIGNING_FORMATS = { - "target.installer.exe": ["autograph_authenticode_sha2_stub"], - "target.stub-installer.exe": ["autograph_authenticode_sha2_stub"], - "target.installer.msi": ["autograph_authenticode_sha2"], - "target.installer.msix": ["autograph_authenticode_sha2"], + "target.installer.exe": ["autograph_authenticode_202404_stub"], + "target.stub-installer.exe": ["autograph_authenticode_202404_stub"], + "target.installer.msi": ["autograph_authenticode_202404"], + "target.installer.msix": ["autograph_authenticode_202404"], } transforms = TransformSequence() diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py index e3940fd846..5f7c893e92 100644 --- a/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py +++ b/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py @@ -93,7 +93,7 @@ def make_repackage_signing_description(config, jobs): "paths": [ get_artifact_path(dep_job, f"{repack_id}/target.installer.exe"), ], - "formats": ["autograph_authenticode_sha2", "autograph_gpg"], + "formats": ["autograph_authenticode_202404", "autograph_gpg"], } ] @@ -113,7 +113,7 @@ def make_repackage_signing_description(config, jobs): f"{repack_id}/target.stub-installer.exe", ), ], - "formats": ["autograph_authenticode_sha2", "autograph_gpg"], + "formats": ["autograph_authenticode_202404", "autograph_gpg"], } ) elif "mac" in build_platform: diff --git a/taskcluster/gecko_taskgraph/util/signed_artifacts.py b/taskcluster/gecko_taskgraph/util/signed_artifacts.py index 61dad14abf..302a2e09f7 100644 --- a/taskcluster/gecko_taskgraph/util/signed_artifacts.py +++ b/taskcluster/gecko_taskgraph/util/signed_artifacts.py @@ -98,14 +98,14 @@ def generate_specifications_of_artifacts_to_sign( "artifacts": [ get_artifact_path(job, "{locale}/setup.exe"), ], - "formats": ["autograph_authenticode_sha2"], + "formats": ["autograph_authenticode_202404"], }, { "artifacts": [ get_artifact_path(job, "{locale}/target.zip"), ], "formats": [ - "autograph_authenticode_sha2", + "autograph_authenticode_202404", "autograph_widevine", "autograph_omnija", ], diff --git a/taskcluster/kinds/repackage-msix/kind.yml b/taskcluster/kinds/repackage-msix/kind.yml index 96ff07c77c..2b5f682ceb 100644 --- a/taskcluster/kinds/repackage-msix/kind.yml +++ b/taskcluster/kinds/repackage-msix/kind.yml @@ -101,8 +101,8 @@ jobs: # level 3 repositories, some build types are expected to # be signed with our fake certificate. by-build-platform: - .*-shippable: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=Mountain View, S=California, C=US" - .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=Mountain View, S=California, C=US" + .*-shippable: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" + .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" default: "CN=Mozilla Fake SPC" publisher-display-name: by-package-format: diff --git a/taskcluster/kinds/repackage-shippable-l10n-msix/kind.yml b/taskcluster/kinds/repackage-shippable-l10n-msix/kind.yml index 021896a7ad..8c7cff523b 100644 --- a/taskcluster/kinds/repackage-shippable-l10n-msix/kind.yml +++ b/taskcluster/kinds/repackage-shippable-l10n-msix/kind.yml @@ -102,8 +102,8 @@ jobs: # level 3 repositories, some build types are expected to # be signed with our fake certificate. by-build-platform: - .*-shippable: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=Mountain View, S=California, C=US" - .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=Mountain View, S=California, C=US" + .*-shippable: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" + .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" default: "CN=Mozilla Fake SPC" publisher-display-name: by-package-format: -- cgit v1.2.3