Remove s_client usage from tls.el

* lisp/net/tls.el (tls-program, tls-checktrust): Remove s_client.
Ref http://bugs.debian.org/766397
http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00803.html

; Backport this to Emacs 25.3, if there is one

(cherry picked from commit 6e45de6bacc508db11b15b2c8ba86aad8c0570df)

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 2273d1345d5583cd547bcab99c184c54eb984f9d..f75a4996b9c2456458e659f6817b1e453ba378f9 100644 (file)
--- 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 the server hostname, %p with the port to
@@ -94,24 +93,21 @@ 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))))
-  :version "22.1"
+  :version "25.3"                       ; remove s_client
   :group 'tls)
 
 (defcustom tls-process-connection-type nil
@@ -138,8 +134,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))