Blacklist "Bogus *" and "Explicitly Distrust DigiNotar *" certificates

diff --git a/debian/changelog b/debian/changelog
index e20bef6c4446eefcb8f6082e7090f6a3047f6685..e301c8af063a02a4416d1e267983e9a08cebc4d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ca-certificates (20111025.1) UNRELEASED; urgency=low
+
+  * Blacklist "Bogus *" and "Explicitly Distrust DigiNotar *" certificates
+
+ -- Michael Shuler <michael@pbandjelly.org>  Fri, 28 Oct 2011 07:06:00 -0500
+
 ca-certificates (20111025) unstable; urgency=low
 
   [ Michael Shuler ]

diff --git a/mozilla/blacklist.txt b/mozilla/blacklist.txt
index 911f9f14f10b34f58cdd1ce68270a337f86588fa..9a71bc46b4c49e66e299d23899c884c246fb6dd5 100644 (file)
--- a/mozilla/blacklist.txt
+++ b/mozilla/blacklist.txt
@@ -5,3 +5,23 @@
 
 # DigiNotar Root CA (see debbug#639744)
 "DigiNotar Root CA"
+
+# Explicitly Distrust DigiNotar certs added by Mozilla
+"Explicitly Distrust DigiNotar Root CA"
+"Explicitly Distrust DigiNotar Services 1024 CA"
+"Explicitly Distrust DigiNotar Cyber CA"
+"Explicitly Distrust DigiNotar Cyber CA 2nd"
+"Explicitly Distrusted DigiNotar PKIoverheid"
+"Explicitly Distrusted DigiNotar PKIoverheid G2"
+
+# Bogus certs added by Mozilla (see #619587)
+"Bogus Mozilla Addons"
+"Bogus Global Trustee"
+"Bogus GMail"
+"Bogus Google"
+"Bogus Skype"
+"Bogus Yahoo 1"
+"Bogus Yahoo 2"
+"Bogus Yahoo 3"
+"Bogus live.com"
+"Bogus kuix.de"