aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2017-04-24 20:06:14 -0400
committerGlenn Morris2017-05-22 19:05:14 -0400
commit16ef7539cb3f361b74a11606edf8fd8346b81cf5 (patch)
treec9888aa6c348798bd3a696351c49b4725ceb6846 /lisp
parent94a6c964a454c8023fde1090617e0600ace72be1 (diff)
downloademacs-16ef7539cb3f361b74a11606edf8fd8346b81cf5.tar.gz
emacs-16ef7539cb3f361b74a11606edf8fd8346b81cf5.zip
Don't advertise s_client in tls.el docs
* lisp/net/tls.el (tls-end-of-info, tls-success, tls-untrusted): Don't mention s_client in docs. ; * doc/misc/gnus.texi (Direct Functions): Comment. (cherry picked from commit 622c24a2b75a564b9861fc3ca7a7878741e8568d)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tls.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index f75a4996b9c..11aae635aae 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -69,9 +69,8 @@
69 "^\\*\\*\\* Starting TLS handshake\n\\)*" 69 "^\\*\\*\\* Starting TLS handshake\n\\)*"
70 "\\)") 70 "\\)")
71 "Regexp matching end of TLS client informational messages. 71 "Regexp matching end of TLS client informational messages.
72Client data stream begins after the last character matched by 72Client data stream begins after the last character this matches.
73this. The default matches `openssl s_client' (version 0.9.8c) 73The default matches the output of \"gnutls-cli\" (version 2.0.1)."
74and `gnutls-cli' (version 2.0.1) output."
75 :version "22.2" 74 :version "22.2"
76 :type 'regexp 75 :type 'regexp
77 :group 'tls) 76 :group 'tls)
@@ -118,8 +117,8 @@ successful negotiation."
118 117
119(defcustom tls-success "- Handshake was completed\\|SSL handshake has read " 118(defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
120 "Regular expression indicating completed TLS handshakes. 119 "Regular expression indicating completed TLS handshakes.
121The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's 120The default is what GnuTLS's \"gnutls-cli\" outputs."
122\"openssl s_client\" outputs." 121;; or OpenSSL's \"openssl s_client\"
123 :version "22.1" 122 :version "22.1"
124 :type 'regexp 123 :type 'regexp
125 :group 'tls) 124 :group 'tls)
@@ -144,9 +143,9 @@ consider trustworthy, e.g.:
144(defcustom tls-untrusted 143(defcustom tls-untrusted
145 "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)" 144 "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)"
146 "Regular expression indicating failure of TLS certificate verification. 145 "Regular expression indicating failure of TLS certificate verification.
147The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's 146The default is what GnuTLS's \"gnutls-cli\" returns in the event of
148\"openssl s_client\" return in the event of unsuccessful 147unsuccessful verification."
149verification." 148;; or OpenSSL's \"openssl s_client\"
150 :type 'regexp 149 :type 'regexp
151 :version "23.1" ;; No Gnus 150 :version "23.1" ;; No Gnus
152 :group 'tls) 151 :group 'tls)