Bug 920750 - Disable update xml certificate checks on Mac OS X. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 08 Apr 2015 00:34:57 -0700
changeset 238159 f87c7a84a77f70bbd93de5e1870ca6e9055996a2
parent 238158 11a31fccdbedcb7c48dbb9f44efdedb55af635e5
child 238160 0a0b4a5cd85857c402f4ad1b6718a6491b8527ae
push id28556
push userryanvm@gmail.com
push dateWed, 08 Apr 2015 16:40:55 +0000
treeherdermozilla-central@2c92a7df87c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs920750
milestone40.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
Bug 920750 - Disable update xml certificate checks on Mac OS X. r=bbondy
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -97,20 +97,20 @@ 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 since the mar signature check which is currently only implemented on
-// Windows is sufficient for preventing us from applying a mar that is not
+// 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.
-#ifdef XP_WIN
+#if defined(XP_WIN) || defined(XP_MACOSX)
 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);