diff options
Diffstat (limited to '')
7 files changed, 21 insertions, 5 deletions
diff --git a/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js b/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js index 21e2ba7b51..487ae9b1c8 100644 --- a/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js +++ b/browser/base/content/test/about/browser_aboutNetError_csp_iframe.js @@ -8,6 +8,10 @@ const BLOCKED_PAGE = "http://example.org:8000/browser/browser/base/content/test/about/csp_iframe.sjs"; add_task(async function test_csp() { + await SpecialPowers.pushPrefEnv({ + set: [["security.xfocsp.hideOpenInNewWindow", false]], + }); + let { iframePageTab, blockedPageTab } = await setupPage( "iframe_page_csp.html", BLOCKED_PAGE diff --git a/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js b/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js index ae4d5c22a2..43a3fd0e2a 100644 --- a/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js +++ b/browser/base/content/test/about/browser_aboutNetError_xfo_iframe.js @@ -8,6 +8,10 @@ const BLOCKED_PAGE = "http://example.org:8000/browser/browser/base/content/test/about/xfo_iframe.sjs"; add_task(async function test_xfo_iframe() { + await SpecialPowers.pushPrefEnv({ + set: [["security.xfocsp.hideOpenInNewWindow", false]], + }); + let { iframePageTab, blockedPageTab } = await setupPage( "iframe_page_xfo.html", BLOCKED_PAGE diff --git a/browser/config/version.txt b/browser/config/version.txt index fc305fd9a7..76a73639cb 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -115.11.0 +115.12.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index d34369691a..94c16eddab 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -115.11.0esr +115.12.0esr 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 |