mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 0ea0832d052d (bug 1079858) for causing bug 1230631 a=backout 

--HG--
extra : commitid : GeBy210BpUB
This commit is contained in:
Wes Kocher 2015-12-04 14:58:55 -08:00
Родитель d3ba1b4c71
Коммит 39967e9806
10 изменённых файлов: 13 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/branding/aurora/branding.nsi
Просмотреть файл

@ -20,7 +20,7 @@
# The installer's certificate name and issuer expected by the stub installer
!define CertNameDownload "Mozilla Corporation"
!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.

2
browser/branding/nightly/branding.nsi
Просмотреть файл

@ -19,7 +19,7 @@
# The installer's certificate name and issuer expected by the stub installer
!define CertNameDownload "Mozilla Corporation"
!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.

2
browser/branding/official/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 SHA2 Assured ID Code Signing CA"
!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.

2
browser/branding/unofficial/branding.nsi
Просмотреть файл

@ -19,7 +19,7 @@
# The installer's certificate name and issuer expected by the stub installer
!define CertNameDownload "Mozilla Corporation"
!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
!define CertIssuerDownload "Thawte Code Signing CA - G2"
# Dialog units are used so the UI displays correctly with the system's DPI
# settings.

2
browser/installer/windows/nsis/defines.nsi.in
Просмотреть файл

@ -37,7 +37,7 @@
!define BrandFullName "${BrandFullNameInternal}"
!define CERTIFICATE_NAME "Mozilla Corporation"
!define CERTIFICATE_ISSUER "DigiCert SHA2 Assured ID Code Signing CA"
!define CERTIFICATE_ISSUER "DigiCert Assured ID Code Signing CA-1"
# LSP_CATEGORIES is the permitted LSP categories for the application. Each LSP
# category value is ANDed together to set multiple permitted categories.

2
browser/installer/windows/nsis/maintenanceservice_installer.nsi
Просмотреть файл

@ -220,7 +220,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 Assured ID Code Signing CA-1"
${If} ${RunningX64}
SetRegView lastused
${EndIf}

2
toolkit/components/maintenanceservice/bootstrapinstaller/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 Assured ID Code Signing CA-1"
WriteRegStr HKLM "${FallbackKey}\1" "name" "Mozilla Fake SPC"
WriteRegStr HKLM "${FallbackKey}\1" "issuer" "Mozilla Fake CA"
${If} ${RunningX64}

4
toolkit/mozapps/installer/signing.mk
Просмотреть файл

@ -8,8 +8,8 @@ ifndef MOZ_PROFILE_GENERATE
# Signing support
ifdef MOZ_SIGN_CMD
ifeq (WINNT,$(OS_ARCH))
MOZ_INTERNAL_SIGNING_FORMAT := sha2signcode
MOZ_EXTERNAL_SIGNING_FORMAT := sha2signcode
MOZ_INTERNAL_SIGNING_FORMAT := osslsigncode
MOZ_EXTERNAL_SIGNING_FORMAT := osslsigncode
SIGN_INCLUDES := \
'*.dll' \
'*.exe' \

4
toolkit/mozapps/installer/upload-files.mk
Просмотреть файл

@ -149,8 +149,8 @@ MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
endif
ifeq ($(MOZ_PKG_FORMAT),ZIP)
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
# We can't use sha2signcode on zip files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
# We can't use osslsigncode on zip files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
endif
PKG_SUFFIX = .zip
INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \

4
tools/update-packaging/Makefile.in
Просмотреть файл

@ -46,8 +46,8 @@ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
# We can't use sha2signcode on mar files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
# We can't use osslsigncode on mar files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out osslsigncode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT)
endif