diff options
| author | Romain Francoise <romain@orebokech.com> | 2010-12-13 23:20:32 +0100 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2010-12-13 23:20:32 +0100 |
| commit | bc5576723b2ddaa0b4cb6a6ba368fa71bc5a8a0c (patch) | |
| tree | 6e74d65380acb212a6a46421702ff3f2cbd48c49 /lisp | |
| parent | 407277e0db56ec163db07815d12ac3a0f641ee03 (diff) | |
| download | emacs-bc5576723b2ddaa0b4cb6a6ba368fa71bc5a8a0c.tar.gz emacs-bc5576723b2ddaa0b4cb6a6ba368fa71bc5a8a0c.tar.bz2 emacs-bc5576723b2ddaa0b4cb6a6ba368fa71bc5a8a0c.zip | |
* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4310dd5fe8..10db215a989 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-12-13 Romain Francoise <romain@orebokech.com> + + * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles. + 2010-12-13 Eli Zaretskii <eliz@gnu.org> * subr.el (posn-col-row): Evaluate header-line-format in the diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 85c546ffd3f..e49af2948e6 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -77,7 +77,7 @@ PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\". TRUSTFILES is a list of CA bundles. KEYFILES is a list of client keys." (let* ((type (or type 'gnutls-x509pki)) - (trusfiles (or trustfiles + (trustfiles (or trustfiles '("/etc/ssl/certs/ca-certificates.crt"))) (priority-string (or priority-string (cond |