Give up on using gnutls-cli for starttls.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb364f9651ea867f05d86a4b9e70703fc7444856..235aec2f4787e2b0f8d82319d9bea2cf8f6a1910 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/tls.el (tls-starttls-switches): Give up on using starttls with
+       gnutls-cli.
+       (tls-program): Add --insecure to be consistent with the defaults from
+       openssl s_client.  Now all three commands are insecure.
+
 2010-10-01  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 32b6716c970a7e5d56cc9f6764fa1c5a9c272c93..4737a414545b94cc220258022319cbdf63f614a3 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-extend-tls-programs): Only extend those programs
+       for starttls that tls.el implements; i.e. openssl.
+
 2010-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gravatar.el: Don't load image.el that XEmacs doesn't provide.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 4d26cdb63715831a3791ff6aab0ffb7b1b6eb623..70aa573525f7332efdb54c7a112f38455ab152f9 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -404,7 +404,11 @@ textual parts.")
     (unless (consp programs)
       (setq programs (list programs)))
     (dolist (program programs)
-      (push (concat program " " "%s") result))
+      (when (assoc (car (split-string program)) tls-starttls-switches)
+       (push (if (not (string-match "%s" program))
+                 (concat program " " "%s")
+               program)
+             result)))
     (nreverse result)))
 
 (defun nnimap-find-parameter (parameter elems)

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index ad0768968e583c535f503a90b34347bdf9af7ebc..daa1c18c8bfb7b33164b501a5d32e516d4f97237 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -76,12 +76,11 @@ and `gnutls-cli' (version 2.0.1) output."
   :group 'tls)
 
 (defvar tls-starttls-switches
-  '(("gnutls-cli" "-s")
-    ("openssl" "-starttls imap"))
+  '(("openssl" "-starttls imap"))
   "Alist of programs and the switches necessary to get starttls behaviour.")
 
-(defcustom tls-program '("gnutls-cli %s -p %p %h"
-                        "gnutls-cli %s -p %p %h --protocols ssl3"
+(defcustom tls-program '("gnutls-cli --insecure -p %p %h"
+                        "gnutls-cli --insecure -p %p %h --protocols ssl3"
                         "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.