From 9db659f9f18a79c7295e609472deb66467be0dbb Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 16 Apr 2017 12:08:07 -0500 Subject: Don't use s_client --- lisp/net/imap.el | 2 +- lisp/net/tls.el | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lisp/net/imap.el b/lisp/net/imap.el index 3e59823..47f3d01 100644 --- a/lisp/net/imap.el +++ b/lisp/net/imap.el @@ -293,7 +293,7 @@ Shorter values mean quicker response, but is more CPU intensive." '((gssapi imap-gssapi-stream-p imap-gssapi-open) (kerberos4 imap-kerberos4-stream-p imap-kerberos4-open) (tls imap-tls-p imap-tls-open) - (ssl imap-ssl-p imap-ssl-open) + (ssl imap-tls-p imap-tls-open) (network imap-network-p imap-network-open) (shell imap-shell-p imap-shell-open) (starttls imap-starttls-p imap-starttls-open)) diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 68a3ff6..287de40 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -78,8 +78,7 @@ and `gnutls-cli' (version 2.0.1) output." (defcustom tls-program '("gnutls-cli --x509cafile %t -p %p %h" - "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3" - "openssl s_client -connect %h:%p -no_ssl2 -ign_eof") + "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3") "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. @@ -93,20 +92,17 @@ successful negotiation." '(choice (const :tag "Default list of commands" ("gnutls-cli --x509cafile %t -p %p %h" - "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3" - "openssl s_client -CAfile %t -connect %h:%p -no_ssl2 -ign_eof")) + "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3")) (list :tag "Choose commands" :value ("gnutls-cli --x509cafile %t -p %p %h" - "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3" - "openssl s_client -connect %h:%p -no_ssl2 -ign_eof") + "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3") (set :inline t ;; FIXME: add brief `:tag "..."' descriptions. ;; (repeat :inline t :tag "Other" (string)) ;; No trust check: (const "gnutls-cli --insecure -p %p %h") - (const "gnutls-cli --insecure -p %p %h --protocols ssl3") - (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")) + (const "gnutls-cli --insecure -p %p %h --protocols ssl3")) (repeat :inline t :tag "Other" (string))) (list :tag "List of commands" (repeat :tag "Command" (string)))) @@ -137,8 +133,7 @@ consider trustworthy, e.g.: \(setq tls-program '(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" - \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\" - \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))" + \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\"))" :type '(choice (const :tag "Always" t) (const :tag "Never" nil) (const :tag "Ask" ask)) -- cgit v0.12