[Emacs-diffs] Changes to emacs/lisp/net/tls.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/04/21 07:13:33

Index: lisp/net/tls.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/tls.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- lisp/net/tls.el     10 Apr 2008 14:10:25 -0000      1.33
+++ lisp/net/tls.el     21 Apr 2008 07:13:33 -0000      1.34
@@ -80,7 +80,7 @@
 
 (defcustom tls-program '("gnutls-cli -p %p %h"
                         "gnutls-cli -p %p %h --protocols ssl3"
-                        "openssl s_client -connect %h:%p -no_ssl2")
+                        "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.
@@ -97,23 +97,23 @@
          :value
          ("gnutls-cli -p %p %h"
           "gnutls-cli -p %p %h --protocols ssl3"
-          "openssl s_client -connect %h:%p -no_ssl2")
+          "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
          (set :inline t
               ;; FIXME: add brief `:tag "..."' descriptions.
               ;; (repeat :inline t :tag "Other" (string))
               ;; See `tls-checktrust':
               (const "gnutls-cli --x509cafile 
/etc/ssl/certs/ca-certificates.crt -p %p %h")
               (const "gnutls-cli --x509cafile 
/etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3")
-              (const "openssl s_client -connect %h:%p -CAfile 
/etc/ssl/certs/ca-certificates.crt -no_ssl2")
+              (const "openssl s_client -connect %h:%p -CAfile 
/etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof")
               ;; No trust check:
               (const "gnutls-cli -p %p %h")
               (const "gnutls-cli -p %p %h --protocols ssl3")
-              (const "openssl s_client -connect %h:%p -no_ssl2"))
+              (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
          (repeat :inline t :tag "Other" (string)))
     (const :tag "Default list of commands"
           ("gnutls-cli -p %p %h"
            "gnutls-cli -p %p %h --protocols ssl3"
-           "openssl s_client -connect %h:%p -no_ssl2"))
+           "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
     (list :tag "List of commands"
          (repeat :tag "Command" (string))))
   :version "22.1"
@@ -144,7 +144,7 @@
 \(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\"))"
+       \"openssl s_client -connect %h:%p -CAfile 
/etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))"
   :type '(choice (const :tag "Always" t)
                 (const :tag "Never" nil)
                 (const :tag "Ask" ask))