[gnus git] branch master updated: m0-13-105-g904903d =1= tls.el: Remove --insecure from gnutls-cli invocation; make tls.el use trustfiles by default

       via  904903d4ffe269f528ed9eaf508f572d7da20a34 (commit)
      from  6b0be16a2af53bfcee8f601f139a59dfd0fe0b98 (commit)


- Log -----------------------------------------------------------------
commit 904903d4ffe269f528ed9eaf508f572d7da20a34
Author: Lars Ingebrigtsen <[email protected]>
Date:   Wed Dec 30 23:40:51 2015 +0000

    tls.el:	Remove --insecure from gnutls-cli invocation;
    make tls.el use trustfiles by default
    
    * tls.el (tls-program):
    Default to using secure TLS connections (bug#19284);
    add a certfile by default (bug#21227).
    (open-tls-stream):
    Insert the trustfile by looking at `gnutls-trustfiles'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcbb755..21e3a63 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2015-12-29  Lars Ingebrigtsen  <[email protected]>
+
+	Remove --insecure from gnutls-cli invocation;
+	make tls.el use trustfiles by default
+
+	* tls.el (tls-program):
+	Default to using secure TLS connections (bug#19284);
+	add a certfile by default (bug#21227).
+	(open-tls-stream):
+	Insert the trustfile by looking at `gnutls-trustfiles'.
+
 2015-12-28  Katsumi Yamaoka  <[email protected]>
 
 	* mml-sec.el (mml-secure-bcc-is-safe):
diff --git a/lisp/tls.el b/lisp/tls.el
index 48e6a42..72fb50e 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -44,6 +44,8 @@
 
 ;;; Code:
 
+(require 'gnutls)
+
 (autoload 'format-spec "format-spec")
 (autoload 'format-spec-make "format-spec")
 
@@ -74,8 +76,9 @@ and `gnutls-cli' (version 2.0.1) output."
   :type 'regexp
   :group 'tls)
 
-(defcustom tls-program '("gnutls-cli --insecure -p %p %h"
-			 "gnutls-cli --insecure -p %p %h --protocols ssl3"
+(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")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
@@ -89,21 +92,17 @@ 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"))
+	   ("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"))
     (list :tag "Choose commands"
 	  :value
-	  ("gnutls-cli --insecure -p %p %h"
-	   "gnutls-cli --insecure -p %p %h --protocols ssl3"
+	  ("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")
 	  (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 -ign_eof")
 	       ;; No trust check:
 	       (const "gnutls-cli --insecure -p %p %h")
 	       (const "gnutls-cli --insecure -p %p %h --protocols ssl3")
@@ -232,6 +231,7 @@ Fourth arg PORT is an integer specifying a port to connect to."
 	       (format-spec
 		cmd
 		(format-spec-make
+                 ?t (car (gnutls-trustfiles))
 		 ?h host
 		 ?p (if (integerp port)
 			(int-to-string port)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |   11 +++++++++++
 lisp/tls.el    |   24 ++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project