Skip disabled PGP key when encrypting mail with Gnus.

* lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
* lisp/gnus/mml2015.el (mml2015-epg-find-usable-key): Skip disabled key (Bug#5592).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d28a4ffda7d1a8725ece0d7cbdacfa603522b6a..df7d21c6124f1f8516d94bde6ef6915d1162cca3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
+
+       * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
+
 2010-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mail/binhex.el (binhex-decode-region-internal)

diff --git a/lisp/epg.el b/lisp/epg.el
index 7791c1865a77180f6e7ccabba7bae500bcefce40..6e69ae09da4c7bfff6bffa41e1b6d48d463c3d86 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -137,7 +137,8 @@
   '((?e . encrypt)
     (?s . sign)
     (?c . certify)
-    (?a . authentication)))
+    (?a . authentication)
+    (?D . disabled)))
 
 (defvar epg-new-signature-type-alist
   '((?D . detached)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d429c0e319f6e6a6ad8c318447e6b6d563703987..d78e07037b47e452d1fab9615b33785203a278bb 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
+
+       * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
+       (Bug#5592).
+
 2010-05-07  Julien Danjou  <julien@danjou.info>
 
        * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 6725709c04456d93ef038328d4d362c2e7ccdee2..130a3ca86a5aaef643a103dec568c6e094a00287 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1021,6 +1021,7 @@ Whether the passphrase is cached at all is controlled by
       (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)))