mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-06 20:49:33 +00:00
Code Issues Releases Activity

Refactor out gnutls-trustfiles

Browse Source 
* lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by tls.el.
This commit is contained in:
Lars Ingebrigtsen 2015-12-29 14:39:53 +01:00
parent ad9aaa460e
commit 1ba1e35fbe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/net/gnutls.el
View File

@ -193,12 +193,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
;; The gnutls library doesn't understand files delivered via ;; The gnutls library doesn't understand files delivered via
;; the special handlers, so ignore all files found via those. ;; the special handlers, so ignore all files found via those.
(file-name-handler-alist nil) (file-name-handler-alist nil)
(trustfiles (or trustfiles (trustfiles (or trustfiles (gnutls-trustfiles)))
(delq nil
(mapcar (lambda (f) (and f (file-exists-p f) f))
(if (functionp gnutls-trustfiles)
(funcall gnutls-trustfiles)
gnutls-trustfiles)))))
(priority-string (or priority-string (priority-string (or priority-string
(cond (cond
((eq type 'gnutls-anon) ((eq type 'gnutls-anon)
@ -251,6 +246,14 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
process)) process))
(defun gnutls-trustfiles ()
"Return a list of usable trustfiles."
(delq nil
(mapcar (lambda (f) (and f (file-exists-p f) f))
(if (functionp gnutls-trustfiles)
(funcall gnutls-trustfiles)
gnutls-trustfiles))))
(declare-function gnutls-error-string "gnutls.c" (error)) (declare-function gnutls-error-string "gnutls.c" (error))
(defun gnutls-message-maybe (doit format &rest params) (defun gnutls-message-maybe (doit format &rest params)