Changes committed gnus/lisp (ChangeLog tls.el)

Modified: ChangeLog tls.el

(tls-program): Add -ign_eof argument to call the openssl commands.
(tls-checktrust): Ditto.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1830 gnus/lisp/ChangeLog:7.1831
--- ChangeLog:7.1830	Sun Apr 13 22:33:41 2008
+++ ChangeLog	Sun Apr 13 22:56:54 2008
@@ -1,3 +1,9 @@
+2008-04-13  Naohiro Aota  <[email protected]>  (tiny change)
+
+	* tls.el (tls-program): Add -ign_eof argument to call the openssl
+	commands.
+	(tls-checktrust): Ditto.
+
 2008-04-13  Reiner Steib  <[email protected]>
 
 	* mm-decode.el (mm-display-external): Make temp file read-only.
Index: tls.el
diff -u gnus/lisp/tls.el:7.24 gnus/lisp/tls.el:7.25
--- tls.el:7.24	Wed Mar 19 23:01:28 2008
+++ tls.el	Sun Apr 13 22:56:54 2008
@@ -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))