[Emacs-diffs] /srv/bzr/emacs/trunk r106095: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106095
author: Daiki Ueno <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-17 04:29:19 +0000
message:
  Merge changes made in Gnus trunk.
  
  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 <address@hidden>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml1991.el
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-11 20:20:08 +0000
+++ b/lisp/gnus/ChangeLog       2011-10-17 04:29:19 +0000
@@ -1,3 +1,10 @@
+2011-10-17  Daiki Ueno  <address@hidden>
+
+       * 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 <address@hidden>.
+
 2011-10-11  Andreas Schwab  <address@hidden>
 
        * html2text.el (html2text-clean-anchor): Check for quotes around

=== modified file 'lisp/gnus/mml1991.el'
--- a/lisp/gnus/mml1991.el      2011-08-04 06:55:53 +0000
+++ b/lisp/gnus/mml1991.el      2011-10-17 04:29:19 +0000
@@ -282,13 +282,16 @@
   (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

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2011-08-28 22:04:32 +0000
+++ b/lisp/gnus/mml2015.el      2011-10-17 04:29:19 +0000
@@ -788,13 +788,16 @@
   (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