summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shuler <michael@pbandjelly.org>2011-09-17 17:45:51 -0500
committerMichael Shuler <michael@pbandjelly.org>2011-09-17 17:45:51 -0500
commit9292bd8a8fde22289355b243f631a8fb6fc597e7 (patch)
tree5133a889d9913b8da045d28e92b28ac61b584975
parent6e0c68a46d230fa0ebe4801a3d55d33df597f3d9 (diff)
downloadca-certificates-debian/20110502+nmu1.tar.gz
Import Debian version 20110502+nmu1debian/20110502+nmu1
-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 afe9432..552c50e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ca-certificates (20110502+nmu1) unstable; 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:00:55 -0500
+
ca-certificates (20110502) unstable; urgency=low
* QA 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"