[Emacs-diffs] /srv/bzr/emacs/trunk r101707: Give up on using gnutls-cli for starttls.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101707
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 12:56:44 +0000
message:
  Give up on using gnutls-cli for starttls.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el
  lisp/net/tls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-01 11:45:16 +0000
+++ b/lisp/ChangeLog    2010-10-01 12:56:44 +0000
@@ -1,3 +1,10 @@
+2010-10-01  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-01 11:15:10 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-01 12:56:44 +0000
@@ -1,3 +1,8 @@
+2010-10-01  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-extend-tls-programs): Only extend those programs
+       for starttls that tls.el implements; i.e. openssl.
+
 2010-10-01  Katsumi Yamaoka  <address@hidden>
 
        * gravatar.el: Don't load image.el that XEmacs doesn't provide.

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-10-01 00:25:50 +0000
+++ b/lisp/gnus/nnimap.el       2010-10-01 12:56:44 +0000
@@ -404,7 +404,11 @@
     (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)

=== modified file 'lisp/net/tls.el'
--- a/lisp/net/tls.el   2010-10-01 00:25:50 +0000
+++ b/lisp/net/tls.el   2010-10-01 12:56:44 +0000
@@ -76,12 +76,11 @@
   :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.