procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix epg filtering out keys that contain revoked IDs

Browse source 
* lisp/epg.el (epg--filter-revoked-keys): Only filter out the
revoked user ids, not the entire key that contains revoked user
ids (bug#46138).
This commit is contained in:
Lars Ingebrigtsen 2021-02-04 09:25:28 +01:00
parent e4cafc5430
commit a8958640c4
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/epg.el
View file

@ -332,7 +332,6 @@ callback data (if any)."
(cl-defstruct (epg-key
(:constructor nil)
(:constructor epg-make-key (owner-trust))
(:copier nil)
(:predicate nil))
(owner-trust nil :read-only t)
sub-key-list user-id-list)
@ -1383,11 +1382,22 @@ NAME is either a string or a list of strings."
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))
(mapcar
(lambda (key)
;; We have something revoked, so copy the key and remove the
;; revoked bits.
(if (seq-find (lambda (user)
(eq (epg-user-id-validity user) 'revoked))
(epg-key-user-id-list key))
(let ((copy (copy-epg-key key)))
(setf (epg-key-user-id-list copy)
(seq-remove (lambda (user)
(eq (epg-user-id-validity user) 'revoked))
(epg-key-user-id-list copy)))
copy)
;; Nothing to delete; return the key.
key))
keys))
(defun epg--args-from-sig-notations (notations)
(apply #'nconc