diff options
| author | Ashish SHUKLA <ashish.is@lostca.se> | 2015-12-24 18:54:41 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2015-12-25 17:02:03 +0100 |
| commit | 5bd3a0c9e00cde01cf325389458f86fd9f05db3f (patch) | |
| tree | 07dd772b7c5f2a09ad1a47e735fe7512e40be055 /lisp | |
| parent | 6ef896cc78b7caf39541a94fd89197d7a0497f9a (diff) | |
| download | emacs-5bd3a0c9e00cde01cf325389458f86fd9f05db3f.tar.gz emacs-5bd3a0c9e00cde01cf325389458f86fd9f05db3f.tar.bz2 emacs-5bd3a0c9e00cde01cf325389458f86fd9f05db3f.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.
Backport:
(cherry picked from commit 60c0f1a18ad88d6dc1a8f4ee5d9d18940eaeb6f7)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/gnutls.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 479c9a579f3..ccaef8aafac 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -67,10 +67,11 @@ set this variable to \"normal:-dhe-rsa\"." (defcustom gnutls-trustfiles '( - "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux - "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL - "/etc/ssl/ca-bundle.pem" ; Suse - "/usr/ssl/certs/ca-bundle.crt" ; Cygwin + "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux + "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL + "/etc/ssl/ca-bundle.pem" ; Suse + "/usr/ssl/certs/ca-bundle.crt" ; Cygwin + "/usr/local/share/certs/ca-root-nss.crt" ; FreeBSD ) "List of CA bundle location filenames or a function returning said list. The files may be in PEM or DER format, as per the GnuTLS documentation. |