summaryrefslogtreecommitdiffstats
path: root/browser/installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:43:14 +0000
commit8dd16259287f58f9273002717ec4d27e97127719 (patch)
tree3863e62a53829a84037444beab3abd4ed9dfc7d0 /browser/installer
parentReleasing progress-linux version 126.0.1-1~progress7.99u1. (diff)
downloadfirefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz
firefox-8dd16259287f58f9273002717ec4d27e97127719.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/installer')
-rw-r--r--browser/installer/windows/msix/AppxManifest.xml.in12
-rw-r--r--browser/installer/windows/nsis/defines.nsi.in4
-rwxr-xr-xbrowser/installer/windows/nsis/installer.nsi19
-rw-r--r--browser/installer/windows/nsis/maintenanceservice_installer.nsi2
-rwxr-xr-xbrowser/installer/windows/nsis/shared.nsh8
5 files changed, 11 insertions, 34 deletions
diff --git a/browser/installer/windows/msix/AppxManifest.xml.in b/browser/installer/windows/msix/AppxManifest.xml.in
index f1c3b6b721..2e11b5d34b 100644
--- a/browser/installer/windows/msix/AppxManifest.xml.in
+++ b/browser/installer/windows/msix/AppxManifest.xml.in
@@ -91,18 +91,6 @@
<uap:Logo>Assets\Document44x44.png</uap:Logo>
</uap3:Protocol>
</uap3:Extension>
- <uap3:Extension Category="windows.protocol">
- <uap3:Protocol Name="firefox-bridge" Parameters="-osint -url &quot;%1&quot;">
- <uap:DisplayName>Firefox Bridge Protocol</uap:DisplayName>
- <uap:Logo>Assets\Document44x44.png</uap:Logo>
- </uap3:Protocol>
- </uap3:Extension>
- <uap3:Extension Category="windows.protocol">
- <uap3:Protocol Name="firefox-private-bridge" Parameters="-osint -private-window &quot;%1&quot;">
- <uap:DisplayName>Firefox Private Bridge Protocol</uap:DisplayName>
- <uap:Logo>Assets\Document44x44.png</uap:Logo>
- </uap3:Protocol>
- </uap3:Extension>
<!-- COM registrations for the notification server. -->
<com:Extension Category="windows.comServer">
<com:ComServer>
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index cbcb2e9be0..ae17ff4d17 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/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index c282067697..ed64931a66 100755
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -474,25 +474,6 @@ Section "-Application" APP_IDX
${AddDisabledDDEHandlerValues} "FirefoxURL-$AppUserModelID" "$2" "$8,${IDI_DOCUMENT_ZERO_BASED}" \
"${AppRegName} URL" "true"
- ; Create protocol registry keys for FirefoxBridge extensions - only if not already set
- SetShellVarContext current ; Set SHCTX to HKCU
- !define FIREFOX_PROTOCOL "firefox-bridge"
- ClearErrors
- ReadRegStr $0 SHCTX "Software\Classes\${FIREFOX_PROTOCOL}" ""
- ${If} $0 == ""
- ${AddDisabledDDEHandlerValues} "${FIREFOX_PROTOCOL}" "$2" "$8,${IDI_APPICON_ZERO_BASED}" \
- "Firefox Bridge Protocol" "true"
- ${EndIf}
-
- !define FIREFOX_PRIVATE_PROTOCOL "firefox-private-bridge"
- ClearErrors
- ReadRegStr $0 SHCTX "Software\Classes\${FIREFOX_PRIVATE_PROTOCOL}" ""
- ${If} $0 == ""
- ${AddDisabledDDEHandlerValues} "${FIREFOX_PRIVATE_PROTOCOL}" "$\"$8$\" -osint -private-window $\"%1$\"" \
- "$8,${IDI_PBICON_PB_EXE_ZERO_BASED}" "Firefox Private Bridge Protocol" "true"
- ${EndIf}
- SetShellVarContext all ; Set SHCTX to HKLM
-
; The keys below can be set in HKCU if needed.
${If} $TmpVal == "HKLM"
; Set the Start Menu Internet and Registered App HKLM registry keys.
diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi
index c285e45bbd..5d50ee9e6c 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 ccad601abe..f9f50a5afa 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -112,6 +112,14 @@
Pop $TmpVal ; get "Marker"
${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