[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 1ba1e35 2/4: Refactor out gnutls-trustfiles
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 1ba1e35 2/4: Refactor out gnutls-trustfiles |
Date: |
Tue, 29 Dec 2015 13:47:19 +0000 |
branch: emacs-25
commit 1ba1e35fbed820ec9d9e1dafbe150f88f29342d8
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Refactor out gnutls-trustfiles
* lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by tls.el.
---
lisp/net/gnutls.el | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index ccaef8a..a7321da 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -193,12 +193,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
;; The gnutls library doesn't understand files delivered via
;; the special handlers, so ignore all files found via those.
(file-name-handler-alist nil)
- (trustfiles (or trustfiles
- (delq nil
- (mapcar (lambda (f) (and f (file-exists-p f) f))
- (if (functionp gnutls-trustfiles)
- (funcall gnutls-trustfiles)
- gnutls-trustfiles)))))
+ (trustfiles (or trustfiles (gnutls-trustfiles)))
(priority-string (or priority-string
(cond
((eq type 'gnutls-anon)
@@ -251,6 +246,14 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
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))
(defun gnutls-message-maybe (doit format &rest params)