Import Debian version 20090701

diff --git a/debian/NEWS b/debian/NEWS
index 19c6f3882d221b1c2f4e297443367ff325df9c03..004cc1608b9ba4f477f92fecec517a0d1ddbb396 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,9 @@
+ca-certificates (20090701) unstable; urgency=low
+
+  * Readded Equifax Secure Global eBusiness CA.
+
+ -- Philipp Kern <pkern@debian.org>  Wed, 01 Jul 2009 14:47:02 +0200
+
 ca-certificates (20090624) unstable; urgency=low
 
   * This update eases the installation of local certification authorities

diff --git a/debian/changelog b/debian/changelog
index 46f792f6eb77bc825e5f0dffb930e2edf115123e..a4d8a5fddb3ef6e4130d5b0c152f5d8dd50b67ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ca-certificates (20090701) unstable; urgency=low
+
+  * Reactivated "Equifax Secure Global eBusiness CA".  (Closes: #534674)
+    Rationale: The rogue collision CA has its validity period in the past.
+    Thus it does not impose a risk upon us at the moment.
+  * Restrict search for local certificates to add on files ending with '.crt'.
+  * Canonicalize PEM names by applying the same set of substitions to
+    local and other certificates like the Mozilla certdata dumper does.
+
+ -- Philipp Kern <pkern@debian.org>  Wed, 01 Jul 2009 14:50:00 +0200
+
 ca-certificates (20090624) unstable; urgency=low
 
   * Allow local certificate installation.  All certificates found

diff --git a/mozilla/blacklist.txt b/mozilla/blacklist.txt
index cc3e19b63413dccfc9d6e02af46bbbb89d1ac5c1..8d57b866349525a8108928cba976e8660cecd273 100644 (file)
--- a/mozilla/blacklist.txt
+++ b/mozilla/blacklist.txt
@@ -1,8 +1,5 @@
 # One blacklist entry per line, corresponding to the label in certdata.txt.
 
-# Parent of "MD5 Collisions Forged Rogue CA 25c3"
-"Equifax Secure Global eBusiness CA"
-
 # MD5 Collision Proof of Concept CA
 "MD5 Collisions Forged Rogue CA 25c3"
 

diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 728e9099764456eb158fa88b0bc4ef0d3426414d..a34ef75b0ce8a15ee81f61c3773587dca523d9fa 100755 (executable)
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -60,7 +60,9 @@ REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
 # bundle.
 add() {
   CERT="$1"
-  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
+  PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
+                                                  -e 's/[()]/=/g' \
+                                                  -e 's/,/_/g').pem"
   if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
   then
     ln -sf "$CERT" "$PEM"
@@ -118,7 +120,7 @@ done
 # administrator.
 if [ -d "$LOCALCERTSDIR" ]
 then
-  find -L "$LOCALCERTSDIR" -type f | while read crt
+  find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt
   do
     add "$crt"
   done