[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 16ef753 2/2: Don't advertise s_client in tls.el d
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-25 16ef753 2/2: Don't advertise s_client in tls.el docs |
Date: |
Mon, 22 May 2017 19:06:03 -0400 (EDT) |
branch: emacs-25
commit 16ef7539cb3f361b74a11606edf8fd8346b81cf5
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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)
---
doc/misc/gnus.texi | 1 +
lisp/net/tls.el | 15 +++++++--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index e32b15c..998294d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13863,6 +13863,7 @@ installed. You then define a server as follows:
(nntp-address "snews.bar.com"))
@end lisp
address@hidden FIXME openssl s_client should be deprecated in favor of gnutls.
@findex nntp-open-ssl-stream
@item nntp-open-ssl-stream
Opens a connection to a server over a @dfn{secure} channel. To use
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index f75a499..11aae63 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -69,9 +69,8 @@
"^\\*\\*\\* Starting TLS handshake\n\\)*"
"\\)")
"Regexp matching end of TLS client informational messages.
-Client data stream begins after the last character matched by
-this. The default matches `openssl s_client' (version 0.9.8c)
-and `gnutls-cli' (version 2.0.1) output."
+Client data stream begins after the last character this matches.
+The default matches the output of \"gnutls-cli\" (version 2.0.1)."
:version "22.2"
:type 'regexp
:group 'tls)
@@ -118,8 +117,8 @@ successful negotiation."
(defcustom tls-success "- Handshake was completed\\|SSL handshake has read "
"Regular expression indicating completed TLS handshakes.
-The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
-\"openssl s_client\" outputs."
+The default is what GnuTLS's \"gnutls-cli\" outputs."
+;; or OpenSSL's \"openssl s_client\"
:version "22.1"
:type 'regexp
:group 'tls)
@@ -144,9 +143,9 @@ consider trustworthy, e.g.:
(defcustom tls-untrusted
"- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^
]\\)"
"Regular expression indicating failure of TLS certificate verification.
-The default is what GnuTLS's \"gnutls-cli\" or OpenSSL's
-\"openssl s_client\" return in the event of unsuccessful
-verification."
+The default is what GnuTLS's \"gnutls-cli\" returns in the event of
+unsuccessful verification."
+;; or OpenSSL's \"openssl s_client\"
:type 'regexp
:version "23.1" ;; No Gnus
:group 'tls)