aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2015-12-29 14:30:53 +0100
committerLars Ingebrigtsen2015-12-29 14:30:53 +0100
commitad9aaa460e2fa446b08124bd8df846e1471c030b (patch)
tree2bf5bca3b07ca83766b7a511ae5ed0190ffdb85d
parent00beafafd7480317bb3bf6c0f2bc04ad344a02de (diff)
downloademacs-ad9aaa460e2fa446b08124bd8df846e1471c030b.tar.gz
emacs-ad9aaa460e2fa446b08124bd8df846e1471c030b.zip
Remove --insecure from gnutls-cli invocation
* tls.el (tls-program): Default to using secure TLS connections (bug#19284).
-rw-r--r--lisp/net/tls.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 48e6a42186c..6745e5d8282 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -74,8 +74,8 @@ and `gnutls-cli' (version 2.0.1) output."
74 :type 'regexp 74 :type 'regexp
75 :group 'tls) 75 :group 'tls)
76 76
77(defcustom tls-program '("gnutls-cli --insecure -p %p %h" 77(defcustom tls-program '("gnutls-cli -p %p %h"
78 "gnutls-cli --insecure -p %p %h --protocols ssl3" 78 "gnutls-cli -p %p %h --protocols ssl3"
79 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof") 79 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
80 "List of strings containing commands to start TLS stream to a host. 80 "List of strings containing commands to start TLS stream to a host.
81Each entry in the list is tried until a connection is successful. 81Each entry in the list is tried until a connection is successful.
@@ -89,13 +89,13 @@ successful negotiation."
89 :type 89 :type
90 '(choice 90 '(choice
91 (const :tag "Default list of commands" 91 (const :tag "Default list of commands"
92 ("gnutls-cli --insecure -p %p %h" 92 ("gnutls-cli -p %p %h"
93 "gnutls-cli --insecure -p %p %h --protocols ssl3" 93 "gnutls-cli -p %p %h --protocols ssl3"
94 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")) 94 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
95 (list :tag "Choose commands" 95 (list :tag "Choose commands"
96 :value 96 :value
97 ("gnutls-cli --insecure -p %p %h" 97 ("gnutls-cli -p %p %h"
98 "gnutls-cli --insecure -p %p %h --protocols ssl3" 98 "gnutls-cli -p %p %h --protocols ssl3"
99 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof") 99 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
100 (set :inline t 100 (set :inline t
101 ;; FIXME: add brief `:tag "..."' descriptions. 101 ;; FIXME: add brief `:tag "..."' descriptions.
@@ -105,8 +105,8 @@ successful negotiation."
105 (const "gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3") 105 (const "gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3")
106 (const "openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof") 106 (const "openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof")
107 ;; No trust check: 107 ;; No trust check:
108 (const "gnutls-cli --insecure -p %p %h") 108 (const "gnutls-cli -p %p %h")
109 (const "gnutls-cli --insecure -p %p %h --protocols ssl3") 109 (const "gnutls-cli -p %p %h --protocols ssl3")
110 (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")) 110 (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
111 (repeat :inline t :tag "Other" (string))) 111 (repeat :inline t :tag "Other" (string)))
112 (list :tag "List of commands" 112 (list :tag "List of commands"