diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-10-01 12:56:44 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-01 12:56:44 +0000 |
| commit | aecb42aa494ca9edb75bb700a807bd9eeed82dca (patch) | |
| tree | 1153cb6c460a28128e88f915f6de65154be26b0a /lisp/net/tls.el | |
| parent | 088dcc3e8c2a0b8a36dd9ac5e515d51e41530bee (diff) | |
| download | emacs-aecb42aa494ca9edb75bb700a807bd9eeed82dca.tar.gz | |
Give up on using gnutls-cli for starttls.
Diffstat (limited to 'lisp/net/tls.el')
| -rw-r--r-- | lisp/net/tls.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/net/tls.el b/lisp/net/tls.el index ad0768968e5..daa1c18c8bf 100644 --- 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. |