summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2011-10-23 12:14:04 -0500
committerMichael Shuler <michael@pbandjelly.org>2011-10-23 12:14:04 -0500
commit398ae1f945719733eb3e9a76513d3583663f1c2f (patch)
treee8139077c47092cfe69ad730539c827b086377de
parent4a8d52eab45f7b1ff3b127d9d7386ab98a33d7c5 (diff)
downloadca-certificates-398ae1f945719733eb3e9a76513d3583663f1c2f.tar.gz
Import Debian Squeeze version 20090814+nmu3debian-squeeze/20090814+nmu3
-rw-r--r--debian/changelog7
-rw-r--r--mozilla/blacklist.txt2
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bbc95f8..7e3bad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ca-certificates (20090814+nmu3) squeeze-security; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Blacklist "DigiNotar Root CA" (Closes: #639744)
+
+ -- Raphael Geissert <geissert@debian.org> Tue, 30 Aug 2011 21:37:34 -0500
+
ca-certificates (20090814+nmu2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/mozilla/blacklist.txt b/mozilla/blacklist.txt
index 8d57b86..911f9f1 100644
--- a/mozilla/blacklist.txt
+++ b/mozilla/blacklist.txt
@@ -3,3 +3,5 @@
# MD5 Collision Proof of Concept CA
"MD5 Collisions Forged Rogue CA 25c3"
+# DigiNotar Root CA (see debbug#639744)
+"DigiNotar Root CA"