aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2018-07-08 13:30:08 +0200
committerLars Ingebrigtsen2018-07-08 13:30:08 +0200
commitf9649f0e147815ddd78073c52cd0e2ad9f33c4e4 (patch)
tree707f29c14a45bb6b2f7558c4251da1e9370ef1b1 /src
parent98463bed07ecc9057094928ffdc2321eaaf3ab52 (diff)
downloademacs-f9649f0e147815ddd78073c52cd0e2ad9f33c4e4.tar.gz
emacs-f9649f0e147815ddd78073c52cd0e2ad9f33c4e4.zip
NSM-related doc fixes
* src/gnutls.c (Fgnutls_peer_status): Mention :certificates in the doc string. * etc/NEWS: Mention how to switch off the additional TLS checks.
Diffstat (limited to 'src')
-rw-r--r--src/gnutls.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index d22d5d267c1..dfbbecfc870 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1210,9 +1210,17 @@ DEFUN ("gnutls-peer-status-warning-describe", Fgnutls_peer_status_warning_descri
1210 1210
1211DEFUN ("gnutls-peer-status", Fgnutls_peer_status, Sgnutls_peer_status, 1, 1, 0, 1211DEFUN ("gnutls-peer-status", Fgnutls_peer_status, Sgnutls_peer_status, 1, 1, 0,
1212 doc: /* Describe a GnuTLS PROC peer certificate and any warnings about it. 1212 doc: /* Describe a GnuTLS PROC peer certificate and any warnings about it.
1213
1213The return value is a property list with top-level keys :warnings and 1214The return value is a property list with top-level keys :warnings and
1214:certificate. The :warnings entry is a list of symbols you can describe with 1215:certificates.
1215`gnutls-peer-status-warning-describe'. */) 1216
1217The :warnings entry is a list of symbols you can get a description of
1218with `gnutls-peer-status-warning-describe', and :certificates is the
1219certificate chain for the connection, with the host certificate
1220first, and intermediary certificates (if any) follow.
1221
1222In addition, for backwards compatibility, the host certificate is also
1223returned as the :certificate entry. */)
1216 (Lisp_Object proc) 1224 (Lisp_Object proc)
1217{ 1225{
1218 Lisp_Object warnings = Qnil, result = Qnil; 1226 Lisp_Object warnings = Qnil, result = Qnil;