Merge from emacs-23

[gnu-emacs] / lisp / gnus / mml2015.el

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 55ebf8cbf0da401b06f5b478a83d92149f99dd87..ee1958b6b8f2ecfc64507024693482b74379b28b 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1,7 +1,7 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
@@ -742,6 +742,7 @@ Whether the passphrase is cached at all is controlled by
 (autoload 'epg-key-sub-key-list "epg")
 (autoload 'epg-sub-key-capability "epg")
 (autoload 'epg-sub-key-validity "epg")
+(autoload 'epg-sub-key-fingerprint "epg")
 (autoload 'epg-configuration "epg-config")
 (autoload 'epg-expand-group "epg-config")
 (autoload 'epa-select-keys "epa")
@@ -784,6 +785,24 @@ Whether the passphrase is cached at all is controlled by
          (setq pointer (cdr pointer))))
       (setq keys (cdr keys)))))
 
+;; XXX: since gpg --list-secret-keys does not return validity of each
+;; key, `mml2015-epg-find-usable-key' defined above is not enough for
+;; secret keys.  The function `mml2015-epg-find-usable-secret-key'
+;; below looks at appropriate public keys to check usability.
+(defun mml2015-epg-find-usable-secret-key (context name usage)
+  (let ((secret-keys (epg-list-keys context name t))
+       secret-key)
+    (while (and (not secret-key) secret-keys)
+      (if (mml2015-epg-find-usable-key
+          (epg-list-keys context (epg-sub-key-fingerprint
+                                  (car (epg-key-sub-key-list
+                                        (car secret-keys)))))
+          usage)
+         (setq secret-key (car secret-keys)
+               secret-keys nil)
+       (setq secret-keys (cdr secret-keys))))
+    secret-key))
+
 (defun mml2015-epg-decrypt (handle ctl)
   (catch 'error
     (let ((inhibit-redisplay t)
@@ -941,6 +960,7 @@ Whether the passphrase is cached at all is controlled by
   (let* ((inhibit-redisplay t)
         (context (epg-make-context))
         (boundary (mml-compute-boundary cont))
+        (sender (message-options-get 'message-sender))
         signer-key
         (signers
          (or (message-options-get 'mml2015-epg-signers)
@@ -950,14 +970,18 @@ Whether the passphrase is cached at all is controlled by
                   (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
-                                   mml2015-signers t)
-                (if mml2015-signers
+                                   (if sender
+                                       (cons (concat "<" sender ">")
+                                             mml2015-signers)
+                                     mml2015-signers)
+                                   t)
+                (if (or sender mml2015-signers)
                     (delq nil
                           (mapcar
                            (lambda (signer)
-                             (setq signer-key (mml2015-epg-find-usable-key
-                                               (epg-list-keys context signer t)
-                                               'sign))
+                             (setq signer-key
+                                   (mml2015-epg-find-usable-secret-key
+                                    context signer 'sign))
                              (unless (or signer-key
                                          (y-or-n-p
                                           (format
@@ -965,7 +989,10 @@ If no one is selected, default secret key is used.  "
                                            signer)))
                                (error "No secret key for %s" signer))
                              signer-key)
-                           mml2015-signers)))))))
+                           (if sender
+                               (cons (concat "<" sender ">")
+                                     mml2015-signers)
+                             mml2015-signers))))))))
         signature micalg)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
@@ -1008,6 +1035,7 @@ If no one is selected, default secret key is used.  "
   (let ((inhibit-redisplay t)
        (context (epg-make-context))
        (config (epg-configuration))
+       (sender (message-options-get 'message-sender))
        (recipients (message-options-get 'mml2015-epg-recipients))
        cipher signers
        (boundary (mml-compute-boundary cont))
@@ -1025,9 +1053,12 @@ If no one is selected, default secret key is used.  "
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
       (when mml2015-encrypt-to-self
-       (unless mml2015-signers
-         (error "mml2015-signers not set"))
-       (setq recipients (nconc recipients mml2015-signers)))
+       (unless (or sender mml2015-signers)
+         (error "Message sender and mml2015-signers not set"))
+       (setq recipients (nconc recipients (if sender
+                                              (cons (concat "<" sender ">")
+                                                    mml2015-signers)
+                                            mml2015-signers))))
       (if (eq mm-encrypt-option 'guided)
          (setq recipients
                (epa-select-keys context "\
@@ -1060,14 +1091,18 @@ If no one is selected, symmetric encryption will be performed.  "
                     (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
-                                     mml2015-signers t)
-                  (if mml2015-signers
+                                     (if sender
+                                         (cons (concat "<" sender ">")
+                                               mml2015-signers)
+                                       mml2015-signers)
+                                     t)
+                  (if (or sender mml2015-signers)
                       (delq nil
                             (mapcar
                              (lambda (signer)
-                               (setq signer-key (mml2015-epg-find-usable-key
-                                                 (epg-list-keys context signer t)
-                                                 'sign))
+                               (setq signer-key
+                                     (mml2015-epg-find-usable-secret-key
+                                      context signer 'sign))
                                (unless (or signer-key
                                            (y-or-n-p
                                             (format
@@ -1075,7 +1110,9 @@ If no one is selected, default secret key is used.  "
                                              signer)))
                                  (error "No secret key for %s" signer))
                                signer-key)
-                             mml2015-signers)))))))
+                             (if sender
+                                 (cons (concat "<" sender ">") mml2015-signers)
+                               mml2015-signers))))))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)