X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Ftls.el;h=3d8d8decf47448a942ea0f8b75df55a5558bb109;hb=378aea34bb2b6ea37439350a3d432fd510b8e223;hp=9b9eb6f8f2ece9fdcc6a1f13dfbda1769d3c1910;hpb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242;p=gnus

diff --git a/lisp/tls.el b/lisp/tls.el
index 9b9eb6f8f..3d8d8decf 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2002-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2013 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -89,10 +89,14 @@ Also see `tls-success' for what the program should output after
 successful negotiation."
   :type
   '(choice
+    (const :tag "Default list of commands"
+	   ("gnutls-cli --insecure -p %p %h"
+	    "gnutls-cli --insecure -p %p %h --protocols ssl3"
+	    "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
     (list :tag "Choose commands"
 	  :value
-	  ("gnutls-cli -p %p %h"
-	   "gnutls-cli -p %p %h --protocols ssl3"
+	  ("gnutls-cli --insecure -p %p %h"
+	   "gnutls-cli --insecure -p %p %h --protocols ssl3"
 	   "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
 	  (set :inline t
 	       ;; FIXME: add brief `:tag "..."' descriptions.
@@ -102,14 +106,10 @@ successful negotiation."
 	       (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 -ign_eof")
 	       ;; No trust check:
-	       (const "gnutls-cli -p %p %h")
-	       (const "gnutls-cli -p %p %h --protocols ssl3")
+	       (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"))
 	  (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 -ign_eof"))
     (list :tag "List of commands"
 	  (repeat :tag "Command" (string))))
   :version "22.1"
@@ -231,16 +231,11 @@ Fourth arg PORT is an integer specifying a port to connect to."
 		 ?h host
 		 ?p (if (integerp port)
 			(int-to-string port)
-		      port))))
-	      response)
+		      port)))))
 	  (message "Opening TLS connection with `%s'..." formatted-cmd)
 	  (setq process (start-process
 			 name buffer shell-file-name shell-command-switch
 			 formatted-cmd))
-	  (funcall (if (fboundp 'set-process-query-on-exit-flag)
-		       'set-process-query-on-exit-flag
-		     'process-kill-without-query)
-		   process nil)
 	  (while (and process
 		      (memq (process-status process) '(open run))
 		      (progn
@@ -291,7 +286,10 @@ NOT trusted. Accept anyway? " host)))))
 			     (format "Host name in certificate doesn't \
 match `%s'. Connect anyway? " host))))))
 	(setq done nil)
-	(delete-process process)))
+	(delete-process process))
+      ;; Delete all the informational messages that could confuse
+      ;; future uses of `buffer'.
+      (delete-region (point-min) (point)))
     (message "Opening TLS connection to `%s'...%s"
 	     host (if done "done" "failed"))
     (when use-temp-buffer