(shr-tag-li): Get <li> indentation right.

[gnus] / lisp / tls.el

diff --git a/lisp/tls.el b/lisp/tls.el
index 64d113a..daa1c18 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,7 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -75,9 +75,13 @@ and `gnutls-cli' (version 2.0.1) output."
   :type 'regexp
   :group 'tls)
 
-(defcustom tls-program '("gnutls-cli -p %p %h"
-                        "gnutls-cli -p %p %h --protocols ssl3"
-                        "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
+(defvar tls-starttls-switches
+  '(("openssl" "-starttls imap"))
+  "Alist of programs and the switches necessary to get starttls behaviour.")
+
+(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.
 %h is replaced with server hostname, %p with port to connect to.
@@ -199,7 +203,7 @@ Used by `tls-certificate-information'."
            (push (cons (match-string 1) (match-string 2)) vals))
          (nreverse vals))))))
 
-(defun open-tls-stream (name buffer host port)
+(defun open-tls-stream (name buffer host port &optional starttlsp)
   "Open a TLS connection for a port to a host.
 Returns a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
@@ -224,18 +228,27 @@ Fourth arg PORT is an integer specifying a port to connect to."
     (with-current-buffer buffer
       (message "Opening TLS connection to `%s'..." host)
       (while (and (not done) (setq cmd (pop cmds)))
-       (message "Opening TLS connection with `%s'..." cmd)
        (let ((process-connection-type tls-process-connection-type)
+             (formatted-cmd
+              (format-spec
+               cmd
+               (format-spec-make
+                ?s (if starttlsp
+                       (tls-find-starttls-argument cmd)
+                     "")
+                ?h host
+                ?p (if (integerp port)
+                       (int-to-string port)
+                     port))))
              response)
+         (message "Opening TLS connection with `%s'..." formatted-cmd)
          (setq process (start-process
                         name buffer shell-file-name shell-command-switch
-                        (format-spec
-                         cmd
-                         (format-spec-make
-                          ?h host
-                          ?p (if (integerp port)
-                                 (int-to-string port)
-                               port)))))
+                        formatted-cmd))
+         (funcall (if (fboundp 'set-process-query-on-exit-flag)
+                      'set-process-query-on-exit-flag
+                    'process-kill-without-query)
+                  process nil)
          (while (and process
                      (memq (process-status process) '(open run))
                      (progn
@@ -244,7 +257,7 @@ Fourth arg PORT is an integer specifying a port to connect to."
                                         tls-success nil t)))))
            (unless (accept-process-output process 1)
              (sit-for 1)))
-         (message "Opening TLS connection with `%s'...%s" cmd
+         (message "Opening TLS connection with `%s'...%s" formatted-cmd
                   (if done "done" "failed"))
          (if (not done)
              (delete-process process)
@@ -294,7 +307,11 @@ match `%s'. Connect anyway? " host))))))
       (kill-buffer buffer))
     done))
 
+(defun tls-find-starttls-argument (command)
+  (let ((command (car (split-string command))))
+    (or (cadr (assoc command tls-starttls-switches))
+       "")))
+
 (provide 'tls)
 
-;; arch-tag: 5596d1c4-facc-4bc4-94a9-9863b928d7ac
 ;;; tls.el ends here