+2010-10-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * nnimap.el (nnimap-extend-tls-programs): Removed.
+ (nnimap-open-connection): Bind STARTTLS to openssl explicitly.
+
+ * tls.el (tls-starttls-switches): Remove starttls hack.
+ (open-tls-stream): Ditto.
+ (tls-find-starttls-argument): Ditto.
+
2010-10-13 Julien Danjou <julien@danjou.info>
* nnimap.el (nnimap-parse-flags): Be more strict when looking for FETCH
(setq port (or nnimap-server-port "imap")))
'("imap"))
((eq nnimap-stream 'starttls)
- (let ((tls-program (nnimap-extend-tls-programs)))
+ (let ((tls-program "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap"))
(open-tls-stream
"*nnimap*" (current-buffer) nnimap-address
(setq port (or nnimap-server-port "imap"))
(nnimap-command "ENABLE QRESYNC"))
(nnimap-process nnimap-object))))))))
-(defun nnimap-extend-tls-programs ()
- (let ((programs tls-program)
- result)
- (unless (consp programs)
- (setq programs (list programs)))
- (dolist (program programs)
- (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)
(let (result)
(dolist (elem elems)
:type 'regexp
:group 'tls)
-(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")
(push (cons (match-string 1) (match-string 2)) vals))
(nreverse vals))))))
-(defun open-tls-stream (name buffer host port &optional starttlsp)
+(defun open-tls-stream (name buffer host port)
"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.
(format-spec
cmd
(format-spec-make
- ?s (if starttlsp
- (tls-find-starttls-argument cmd)
- "")
?h host
?p (if (integerp port)
(int-to-string port)
(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)
;;; tls.el ends here