diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2012-02-14 08:13:24 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2012-02-14 08:13:24 -0500 |
| commit | 08dcdbc94a7eb803833087c6b316131282628207 (patch) | |
| tree | 0820f51f3119116ac52be42759a766e06aed7983 | |
| parent | 1deeb569b1247db4c0b2eea4906a9e53e5ee7e99 (diff) | |
| download | emacs-08dcdbc94a7eb803833087c6b316131282628207.tar.gz | |
(gnutls-trustfiles): Add Cygwin location.
* net/gnutls.el (gnutls-trustfiles): Add Cygwin location.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c7e8f2e8f8..94f5ebcb600 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-02-14 Teodor Zlatanov <tzz@lifelogs.com> + + * net/gnutls.el (gnutls-trustfiles): Add Cygwin location. + 2012-02-13 Glenn Morris <rgm@gnu.org> * minibuffer.el (read-file-name): Doc fix. (Bug#10798) diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 9b734637103..2fd276cf1c6 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -56,6 +56,7 @@ set this variable to \"normal:-dhe-rsa\"." "/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/cert/ca-bundle.crt" ; Cygwin ) "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. |