From 445a6e86233c733c5557ef44e1d33444adaddefc Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Wed, 15 May 2024 23:07:48 +0300 Subject: [PATCH] Backed out 2 changesets (bug 1895492, bug 1889299) for causing bug 1896944. a=backout Backed out changeset c35b87066434 (bug 1889299) Backed out changeset 3fd1528e5f79 (bug 1895492) --- browser/branding/aurora/branding.nsi | 2 +- browser/branding/nightly/branding.nsi | 2 +- browser/branding/official/branding.nsi | 2 +- browser/branding/unofficial/branding.nsi | 2 +- other-licenses/nsis/Plugins/InetBgDL.dll | Bin 24992 -> 17856 bytes .../transforms/geckodriver_signing.py | 2 +- .../transforms/openh264_signing.py | 2 +- .../transforms/repackage_signing.py | 8 ++++---- .../transforms/repackage_signing_partner.py | 4 ++-- .../gecko_taskgraph/util/signed_artifacts.py | 4 ++-- taskcluster/kinds/repackage-msix/kind.yml | 4 ++-- .../repackage-shippable-l10n-msix/kind.yml | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi index 682fa9fda54f..f3c573733e44 100644 --- a/browser/branding/aurora/branding.nsi +++ b/browser/branding/aurora/branding.nsi @@ -24,7 +24,7 @@ # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi index 636d2f782454..b37853b77643 100644 --- a/browser/branding/nightly/branding.nsi +++ b/browser/branding/nightly/branding.nsi @@ -23,7 +23,7 @@ # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi index 94ffbaa98f12..bbdead7e4a33 100644 --- a/browser/branding/official/branding.nsi +++ b/browser/branding/official/branding.nsi @@ -28,7 +28,7 @@ # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" # Dialog units are used so the UI displays correctly with the system's DPI # settings. These are tweaked to look good with the en-US strings; ideally diff --git a/browser/branding/unofficial/branding.nsi b/browser/branding/unofficial/branding.nsi index 4c52c1d0c0a4..1fc5c12d2af9 100644 --- a/browser/branding/unofficial/branding.nsi +++ b/browser/branding/unofficial/branding.nsi @@ -23,7 +23,7 @@ # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/other-licenses/nsis/Plugins/InetBgDL.dll b/other-licenses/nsis/Plugins/InetBgDL.dll index fb9aec978768e89093687bc0a6537b7fb51e9f91..6cb91637bda09af1a88a27a443568a9e8c828f43 100644 GIT binary patch delta 8215 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 diff --git a/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py b/taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py index 25f861e662dc..95b8d3dd5408 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_202404" + signing_format = "autograph_authenticode_sha2" 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 74aebbd90b79..00a55dad41ac 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_202404"] + upstream_artifact["formats"] = ["autograph_authenticode_sha2"] 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 d4106efb2924..66c1f87d7018 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_202404_stub"], - "target.stub-installer.exe": ["autograph_authenticode_202404_stub"], - "target.installer.msi": ["autograph_authenticode_202404"], - "target.installer.msix": ["autograph_authenticode_202404"], + "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"], } transforms = TransformSequence() diff --git a/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py b/taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py index 5f7c893e9276..e3940fd84669 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_202404", "autograph_gpg"], + "formats": ["autograph_authenticode_sha2", "autograph_gpg"], } ] @@ -113,7 +113,7 @@ def make_repackage_signing_description(config, jobs): f"{repack_id}/target.stub-installer.exe", ), ], - "formats": ["autograph_authenticode_202404", "autograph_gpg"], + "formats": ["autograph_authenticode_sha2", "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 302a2e09f7e6..61dad14abf9b 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_202404"], + "formats": ["autograph_authenticode_sha2"], }, { "artifacts": [ get_artifact_path(job, "{locale}/target.zip"), ], "formats": [ - "autograph_authenticode_202404", + "autograph_authenticode_sha2", "autograph_widevine", "autograph_omnija", ], diff --git a/taskcluster/kinds/repackage-msix/kind.yml b/taskcluster/kinds/repackage-msix/kind.yml index 2b5f682ceb1e..96ff07c77c13 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=San Francisco, S=California, C=US" - .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" + .*-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" 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 8c7cff523b81..021896a7ad91 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=San Francisco, S=California, C=US" - .*-devedition: "CN=Mozilla Corporation, OU=Firefox Engineering Operations, O=Mozilla Corporation, L=San Francisco, S=California, C=US" + .*-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" default: "CN=Mozilla Fake SPC" publisher-display-name: by-package-format: