From 89561e4f60e97a24d6965a4c6eca9b2195ea400b Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 4 Jul 2013 12:53:21 +0200
Subject: enigmail 1.5.2

---
 rhbz-966424.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 rhbz-966424.patch

(limited to 'rhbz-966424.patch')

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)
-- 
cgit