2 files changed, 22 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4738fb4812f..0fe85f0d221 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-12  Simon Josefsson  <jas@extundo.com>
+
+        * net/tls.el (tls-certtool-program): New variable.
+        (tls-certificate-information): New function, based on
+        ssl-certificate-information.
+
 2004-10-12  Kenichi Handa  <handa@m17n.org>
 
         * international/mule.el (coding-system-equal): Moved from
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index c441dc37d7a..91a6c869a21 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,19 @@
+2004-10-12  Simon Josefsson  <jas@extundo.com>
+
+        * url-vars.el (url-gateway-method): Add new method `tls'.
+
+        * url-news.el (url-snews): Use nntp-open-tls-stream if
+        url-gateway-method is tls.
+
+        * url-ldap.el (url-ldap-certificate-formatter): Use
+        tls-certificate-information if ssl.el is not available.
+
+        * url-https.el (url-https-create-secure-wrapper): Use tls if ssl
+        is not available.
+
+        * url-gw.el (url-open-stream): Support tls url-gateway-method.
+        (url-open-stream): Likewise.
+
 2004-10-10  Lars Hansen  <larsh@math.ku.dk>
 
         * url-auth.el: Fix copyright notice.