mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

Merge changes made in Gnus trunk.

Browse Source 
mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the primary key is marked as disabled.
mml1991.el (mml1991-epg-find-usable-key): Ditto.  Thanks to Christian von Roques <roques@mti.ag>.
This commit is contained in:
Daiki Ueno 2011-10-17 04:29:19 +00:00 committed by Katsumi Yamaoka
parent 21fedf28e5
commit 344465fd3b
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/gnus/ChangeLog
View File

@ -1,3 +1,10 @@
2011-10-17 Daiki Ueno <ueno@unixuser.org>
* mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the
primary key is marked as disabled.
* mml1991.el (mml1991-epg-find-usable-key): Ditto.
Thanks to Christian von Roques <roques@mti.ag>.
2011-10-11 Andreas Schwab <schwab@linux-m68k.org>
* html2text.el (html2text-clean-anchor): Check for quotes around

17
lisp/gnus/mml1991.el
View File

@ -282,13 +282,16 @@ Whether the passphrase is cached at all is controlled by
(catch 'found
(while keys
(let ((pointer (epg-key-sub-key-list (car keys))))
(while pointer
(if (and (memq usage (epg-sub-key-capability (car pointer)))
(not (memq 'disabled (epg-sub-key-capability (car pointer))))
(not (memq (epg-sub-key-validity (car pointer))
'(revoked expired))))
(throw 'found (car keys)))
(setq pointer (cdr pointer))))
;; The primary key will be marked as disabled, when the entire
;; key is disabled (see 12 Field, Format of colon listings, in
;; gnupg/doc/DETAILS)
(unless (memq 'disabled (epg-sub-key-capability (car pointer)))
(while pointer
(if (and (memq usage (epg-sub-key-capability (car pointer)))
(not (memq (epg-sub-key-validity (car pointer))
'(revoked expired))))
(throw 'found (car keys)))
(setq pointer (cdr pointer)))))
(setq keys (cdr keys)))))
;; XXX: since gpg --list-secret-keys does not return validity of each

17
lisp/gnus/mml2015.el
View File

@ -788,13 +788,16 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
(catch 'found
(while keys
(let ((pointer (epg-key-sub-key-list (car keys))))
(while pointer
(if (and (memq usage (epg-sub-key-capability (car pointer)))
(not (memq 'disabled (epg-sub-key-capability (car pointer))))
(not (memq (epg-sub-key-validity (car pointer))
'(revoked expired))))
(throw 'found (car keys)))
(setq pointer (cdr pointer))))
;; The primary key will be marked as disabled, when the entire
;; key is disabled (see 12 Field, Format of colon listings, in
;; gnupg/doc/DETAILS)
(unless (memq 'disabled (epg-sub-key-capability (car pointer)))
(while pointer
(if (and (memq usage (epg-sub-key-capability (car pointer)))
(not (memq (epg-sub-key-validity (car pointer))
'(revoked expired))))
(throw 'found (car keys)))
(setq pointer (cdr pointer)))))
(setq keys (cdr keys)))))
;; XXX: since gpg --list-secret-keys does not return validity of each