diff options
| author | Ashish SHUKLA | 2015-12-24 18:54:41 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2015-12-24 18:54:41 +0100 |
| commit | 60c0f1a18ad88d6dc1a8f4ee5d9d18940eaeb6f7 (patch) | |
| tree | 33ef6c71baafa3b8a1e965cdb89180c7c711de38 /doc | |
| parent | 45ebbc0301c8514a5f3215f45981c787cb26f915 (diff) | |
| download | emacs-60c0f1a18ad88d6dc1a8f4ee5d9d18940eaeb6f7.tar.gz emacs-60c0f1a18ad88d6dc1a8f4ee5d9d18940eaeb6f7.zip | |
Add FreeBSD cert bundle
* doc/misc/emacs-gnutls.texi (Help For Users): Document
FreeBSD bundle.
* lisp/net/gnutls.el (gnutls-trustfiles): Add FreeBSD cert bundle.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/emacs-gnutls.texi | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi index 4f6ef010ef3..d951e2fde32 100644 --- a/doc/misc/emacs-gnutls.texi +++ b/doc/misc/emacs-gnutls.texi | |||
| @@ -123,14 +123,15 @@ The @code{gnutls-trustfiles} variable is a list of trustfiles | |||
| 123 | host name (although @code{gnutls-negotiate} supports a trustfile per | 123 | host name (although @code{gnutls-negotiate} supports a trustfile per |
| 124 | connection so it could be done if needed). The trustfiles can be in | 124 | connection so it could be done if needed). The trustfiles can be in |
| 125 | PEM or DER format and examples can be found in most Unix | 125 | PEM or DER format and examples can be found in most Unix |
| 126 | distributions. By default four locations are tried in this order: | 126 | distributions. By default the following locations are tried in this |
| 127 | @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu, Gentoo | 127 | order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu, |
| 128 | and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for Fedora | 128 | Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for |
| 129 | and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse; | 129 | Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse; |
| 130 | @file{/usr/ssl/certs/ca-bundle.crt} for Cygwin. You can easily | 130 | @file{/usr/ssl/certs/ca-bundle.crt} for Cygwin; |
| 131 | customize @code{gnutls-trustfiles} to be something else, but let us | 131 | @file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD. You can |
| 132 | know if you do, so we can make the change to benefit the other users | 132 | easily customize @code{gnutls-trustfiles} to be something else, but |
| 133 | of that platform. | 133 | let us know if you do, so we can make the change to benefit the other |
| 134 | users of that platform. | ||
| 134 | @end defvar | 135 | @end defvar |
| 135 | 136 | ||
| 136 | @defvar gnutls-verify-error | 137 | @defvar gnutls-verify-error |