summaryrefslogtreecommitdiffstats
path: root/rhbz-966424.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-06-24 15:08:28 +0200
committerRemi Collet <fedora@famillecollet.com>2013-06-24 15:08:28 +0200
commitfebddb3746039770061168f17a7250bdcdc19b79 (patch)
treed5cc814f7f2a680f54908c395339f03d2628e717 /rhbz-966424.patch
parent46b1a805b4370e1dfb357fcd6600af4829a3ae68 (diff)
Xulrunner / Firefox 22.0
Diffstat (limited to 'rhbz-966424.patch')
-rw-r--r--rhbz-966424.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/rhbz-966424.patch b/rhbz-966424.patch
new file mode 100644
index 0000000..37ddc6e
--- /dev/null
+++ b/rhbz-966424.patch
@@ -0,0 +1,24 @@
+diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/toolkit/mozapps/shared/CertUtils.jsm
+--- a/toolkit/mozapps/shared/CertUtils.jsm
++++ b/toolkit/mozapps/shared/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+ issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+ var tokenNames = issuerCert.getAllTokenNames({});
+
+ if (!tokenNames || !tokenNames.some(isBuiltinToken))
+ throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
+ * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
+ * security dialogs from being shown to the user. It is better to simply fail
+ * if the certificate is bad. See bug 304286.
+ *
+ * @param aAllowNonBuiltInCerts (optional)