From a1d16a7bd90d15d6a1a5aa804c08ae62d38646b5 Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Wed, 13 Oct 2010 22:21:20 +0000 Subject: Merge changes made in Gnus trunk. auth.texi (GnuPG and EasyPG Assistant Configuration): Fix syntax and trim sentence. shr.el (shr-current-column): Remove buggy and unnecessary function. auth.texi: Fix up pxref/xref. auth.texi (GnuPG and EasyPG Assistant Configuration): Fix up the @item syntax for in-Emacs makeinfo. gnus-spec.el (gnus-parse-simple-format): princ doesn't really insert anything in Emacs. mm-decode.el (mm-shr): Allow use from non-Gnus users. nnimap.el (nnimap-parse-flags): Be more strict when looking for FETCH responses. nnimap.el, tls.el: Rip the STARTTLS stuff out of tls.el again, and just bind it directly from nnimap. shr.el (shr-find-fill-point): Use a filling algorithm that should probably work for CJVK text, too. nnimap.el (nnimap-open-connection): Fix open-tls-stream call. nnimap.el (nnimap-parse-flags): Fix regexp. tls.el (tls-program): Remove spurious %s from openssl. shr.el (shr-find-fill-point): Don't inloop on indented text. --- lisp/net/tls.el | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'lisp/net/tls.el') diff --git a/lisp/net/tls.el b/lisp/net/tls.el index daa1c18c8bf..0ab4293f0d6 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -75,13 +75,9 @@ and `gnutls-cli' (version 2.0.1) output." :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") + "openssl s_client -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. @@ -203,7 +199,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 &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. @@ -233,9 +229,6 @@ Fourth arg PORT is an integer specifying a port to connect to." (format-spec cmd (format-spec-make - ?s (if starttlsp - (tls-find-starttls-argument cmd) - "") ?h host ?p (if (integerp port) (int-to-string port) @@ -307,11 +300,6 @@ 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) ;;; tls.el ends here -- cgit v1.2.3