diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:41:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:41:35 +0000 |
| commit | 2d861407bd7e9cc56fba8f2f763fe62dddb4da81 (patch) | |
| tree | 32d9a69e31440af23173f321c975471ca10608c0 /browser/installer | |
| parent | Releasing progress-linux version 115.11.0esr-1~progress7.99u1. (diff) | |
| download | firefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.tar.xz firefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.zip | |
Merging upstream version 115.12.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | browser/installer/windows/nsis/defines.nsi.in | 4 | ||||
| -rw-r--r-- | browser/installer/windows/nsis/maintenanceservice_installer.nsi | 2 | ||||
| -rwxr-xr-x | browser/installer/windows/nsis/shared.nsh | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 8995066b02..f38c0da016 100644 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -54,11 +54,11 @@ !define IDI_PBICON_PB_EXE_ZERO_BASED "0" !define CERTIFICATE_NAME "Mozilla Corporation" -!define CERTIFICATE_ISSUER "DigiCert SHA2 Assured ID Code Signing CA" +!define CERTIFICATE_ISSUER "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" ; Changing the name or issuer requires us to have both the old and the new ; in the registry at the same time, temporarily. !define CERTIFICATE_NAME_PREVIOUS "Mozilla Corporation" -!define CERTIFICATE_ISSUER_PREVIOUS "DigiCert Assured ID Code Signing CA-1" +!define CERTIFICATE_ISSUER_PREVIOUS "DigiCert SHA2 Assured ID Code Signing CA" # LSP_CATEGORIES is the permitted LSP categories for the application. Each LSP # category value is ANDed together to set multiple permitted categories. diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi index ff87ef0839..39a4000c5b 100644 --- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi +++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi @@ -217,7 +217,7 @@ Section "MaintenanceService" ; These keys are used to bypass the installation dir is a valid installation ; check from the service so that tests can be run. ; WriteRegStr HKLM "${FallbackKey}\0" "name" "Mozilla Corporation" - ; WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert SHA2 Assured ID Code Signing CA" + ; WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1" ${If} ${RunningX64} ${OrIf} ${IsNativeARM64} SetRegView lastused diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 2df14e8cf9..3c1610ee3d 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -130,6 +130,14 @@ ${EndIf} ${EndIf} + ClearErrors + WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" + ${If} ${Errors} + StrCpy $TmpVal "HKCU" + ${Else} + StrCpy $TmpVal "HKLM" + ${EndIf} + !ifdef MOZ_MAINTENANCE_SERVICE Call IsUserAdmin Pop $R0 |