author | Robert Strong <robert.bugzilla@gmail.com> |
Wed, 29 Jul 2015 12:39:56 -0700 (2015-07-29) | |
changeset 255237 | 8388bcc795535677bae938b0a6d7b5d7d307c1bc |
parent 255236 | 137551feecddf9610fb3c2d96fe68fd9ea4a42ea |
child 255238 | 09573cae39d381301c36bda5b1563aca42453cf9 |
push id | 29133 |
push user | kwierso@gmail.com |
push date | Thu, 30 Jul 2015 00:57:40 +0000 (2015-07-30) |
treeherder | mozilla-central@ac1dbff4c791 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bbondy |
bugs | 1151485 |
milestone | 42.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -103,65 +103,22 @@ pref("app.update.altwindowtype", "Browse pref("app.update.log", false); // The number of general background check failures to allow before notifying the // user of the failure. User initiated update checks always notify the user of // the failure. pref("app.update.backgroundMaxErrors", 10); // The aus update xml certificate checks for application update are disabled on -// Windows and Mac OS X since the mar signature check are implemented on these -// platforms and is sufficient to prevent us from applying a mar that is not -// valid. -#if defined(XP_WIN) || defined(XP_MACOSX) +// Windows, Mac OS X, and Linux since the mar signature check are implemented on +// these platforms and is sufficient to prevent us from applying a mar that is +// not valid. Bug 1182352 will remove the update xml certificate checks and the +// following two preferences. pref("app.update.cert.requireBuiltIn", false); pref("app.update.cert.checkAttributes", false); -#else -// When |app.update.cert.requireBuiltIn| is true or not specified the -// final certificate and all certificates the connection is redirected to before -// the final certificate for the url specified in the |app.update.url| -// preference must be built-in. -pref("app.update.cert.requireBuiltIn", true); - -// When |app.update.cert.checkAttributes| is true or not specified the -// certificate attributes specified in the |app.update.certs.| preference branch -// are checked against the certificate for the url specified by the -// |app.update.url| preference. -pref("app.update.cert.checkAttributes", true); - -// The number of certificate attribute check failures to allow for background -// update checks before notifying the user of the failure. User initiated update -// checks always notify the user of the certificate attribute check failure. -pref("app.update.cert.maxErrors", 5); - -// The |app.update.certs.| preference branch contains branches that are -// sequentially numbered starting at 1 that contain attribute name / value -// pairs for the certificate used by the server that hosts the update xml file -// as specified in the |app.update.url| preference. When these preferences are -// present the following conditions apply for a successful update check: -// 1. the uri scheme must be https -// 2. the preference name must exist as an attribute name on the certificate and -// the value for the name must be the same as the value for the attribute name -// on the certificate. -// If these conditions aren't met it will be treated the same as when there is -// no update available. This validation will not be performed when the -// |app.update.url.override| user preference has been set for testing updates or -// when the |app.update.cert.checkAttributes| preference is set to false. Also, -// the |app.update.url.override| preference should ONLY be used for testing. -// IMPORTANT! media.gmp-manager.certs.* prefs should also be updated if these -// are updated. - -// Non-release builds (Nightly, Aurora, etc.) have been switched over to aus4.mozilla.org. -// This condition protects us against accidentally using it for release builds. -pref("app.update.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US"); -pref("app.update.certs.1.commonName", "aus4.mozilla.org"); - -pref("app.update.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); -pref("app.update.certs.2.commonName", "aus4.mozilla.org"); -#endif // Whether or not app updates are enabled pref("app.update.enabled", true); // This preference turns on app.update.mode and allows automatic download and // install to take place. We use a separate boolean toggle for this to make // the UI easier to construct. pref("app.update.auto", true);