*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index b451fd07efd21b4157ad1e6fcff2b6d9a31bb3b4..32b614a062fe345fad6f04d6203ae5e553ae941e 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1045,6 +1045,12 @@ counter to the specified source line (the one where point is).
 
   Minor Improvements
 
+*** The STARTTLS elisp wrapper (starttls.el) can now use GNUTLS
+instead of the OpenSSL based "starttls" tool.  For backwards
+compatibility, it will prefer "starttls", but you can toggle
+`starttls-use-gnutls' to switch to GNUTLS (or simply remove the
+"starttls" tool).
+
 *** Do not allow debugger output history variable to grow without bounds.
 
 +++

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7bcb47d7d049cc335c3c9a8b93ae35f20083ef39..a600fd5870cb06db3535347baa0fef0128dfe84a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2004-05-26  Simon Josefsson  <jas@extundo.com>
+
+       * starttls.el: Merge with my GNUTLS based starttls.el.
+       (starttls-gnutls-program, starttls-use-gnutls)
+       (starttls-extra-arguments, starttls-process-connection-type)
+       (starttls-connect, starttls-failure, starttls-success): New
+       variables.
+       (starttls-program, starttls-extra-args): Doc fix.
+       (starttls-negotiate-gnutls, starttls-open-stream-gnutls): New
+       functions.
+       (starttls-negotiate, starttls-open-stream): Check
+       `starttls-use-gnutls' and pass on to corresponding *-gnutls
+       function if it is set.
+
 2004-05-27  Luc Teirlinck  <teirllm@auburn.edu>
 
        * autorevert.el (auto-revert-handler): Disable auto-reverting of