[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 45630ca: Filter revoked keys when saving files
From: |
Lars Ingebrigtsen |
Subject: |
master 45630ca: Filter revoked keys when saving files |
Date: |
Wed, 9 Dec 2020 07:17:31 -0500 (EST) |
branch: master
commit 45630ca6c839719dfc92583de5e606abba4b5718
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Filter revoked keys when saving files
* lisp/epa-file.el (epa-file-write-region): Use it to select a
non-revoked key (bug#22359).
* lisp/epg.el (epg--filter-revoked-keys): New function.
---
lisp/epa-file.el | 3 ++-
lisp/epg.el | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 7fd4178..21dc1eb 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -309,7 +309,8 @@ encryption is used."
If no one is selected, symmetric encryption will be performed. "
recipients)
(if epa-file-encrypt-to
- (epg-list-keys context recipients)))))
+ (epg--filter-revoked-keys
+ (epg-list-keys context recipients))))))
(error
(epa-display-error context)
(if (setq entry (assoc file epa-file-passphrase-alist))
diff --git a/lisp/epg.el b/lisp/epg.el
index 920b853..b27e2c6 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1382,6 +1382,13 @@ NAME is either a string or a list of strings."
(setq pointer (cdr pointer)))
keys))
+(defun epg--filter-revoked-keys (keys)
+ (seq-remove (lambda (key)
+ (seq-find (lambda (user)
+ (eq (epg-user-id-validity user) 'revoked))
+ (epg-key-user-id-list key)))
+ keys))
+
(defun epg--args-from-sig-notations (notations)
(apply #'nconc
(mapcar
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 45630ca: Filter revoked keys when saving files,
Lars Ingebrigtsen <=