Bug 926975 - Update Thunderbird installer for new certificate issuers. r+a=Standard8
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Mon, 21 Oct 2013 15:49:15 +0100
changeset 13696 278cb52e4b3cb8a584e65718a13a2ffce6cb809d
parent 13695 6fed5aa890e49d935dcdad84d7000f5a3b0783f4
child 13697 d997d2414dd2915ebf23df40258a13a596f3bb33
child 13699 3663d7c37d88a54c8b02d3a91fb2b76113c59fe0
push id65
push userbugzilla@standard8.plus.com
push dateMon, 18 Nov 2013 09:43:04 +0000
bugs926975
Bug 926975 - Update Thunderbird installer for new certificate issuers. r+a=Standard8
mail/installer/windows/nsis/defines.nsi.in
mail/installer/windows/nsis/maintenanceservice_installer.nsi
--- a/mail/installer/windows/nsis/defines.nsi.in
+++ b/mail/installer/windows/nsis/defines.nsi.in
@@ -19,17 +19,17 @@
 
 !define ClientsRegName        "Mozilla Thunderbird"
 
 !define BrandShortName        "@MOZ_APP_DISPLAYNAME@"
 !define PreReleaseSuffix      "@PRE_RELEASE_SUFFIX@"
 !define BrandFullName         "${BrandFullNameInternal}${PreReleaseSuffix}"
 
 !define CERTIFICATE_NAME      "Mozilla Corporation"
-!define CERTIFICATE_ISSUER    "Thawte Code Signing CA - G2"
+!define CERTIFICATE_ISSUER    "DigiCert Assured ID Code Signing CA-1"
 
 # NO_INSTDIR_FROM_REG is defined for pre-releases which have a PreReleaseSuffix
 # (e.g. Alpha X, Beta X, etc.) to prevent finding a non-default installation
 # directory in the registry and using that as the default. This prevents
 # Beta releases built with official branding from finding an existing install
 # of an official release and defaulting to its installation directory.
 !if "@PRE_RELEASE_SUFFIX@" != ""
 !define NO_INSTDIR_FROM_REG
--- a/mail/installer/windows/nsis/maintenanceservice_installer.nsi
+++ b/mail/installer/windows/nsis/maintenanceservice_installer.nsi
@@ -205,17 +205,17 @@ Section "MaintenanceService"
   ${EndIf}
   WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Attempted" 1
   WriteRegDWORD HKLM "Software\Mozilla\MaintenanceService" "Installed" 1
 
   ; Included here for debug purposes only.  
   ; 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" "Thawte Code Signing CA - G2"
+  ; WriteRegStr HKLM "${FallbackKey}\0" "issuer" "DigiCert Assured ID Code Signing CA-1"
   ${If} ${RunningX64}
     SetRegView lastused
   ${EndIf}
 SectionEnd
 
 ; By renaming before deleting we improve things slightly in case
 ; there is a file in use error. In this case a new install can happen.
 Function un.RenameDelete