* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / pgg-gpg.el

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 0343946..9807846 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -25,7 +25,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'pgg))
+(eval-when-compile
+  (require 'cl)                                ; for gpg macros
+  (require 'pgg))
 
 (defgroup pgg-gpg ()
   "GnuPG interface"
@@ -39,9 +41,7 @@
 (defcustom pgg-gpg-extra-args nil
   "Extra arguments for every GnuPG invocation."
   :group 'pgg-gpg
-  :type '(choice
-         (const :tag "None" nil)
-         (string :tag "Arguments")))
+  :type '(repeat (string :tag "Argument")))
 
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")
@@ -65,8 +65,9 @@
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-          (let* ((coding-system-for-write 'binary)
-                 (input (buffer-substring-no-properties start end)))
+          (let ((coding-system-for-write 'binary)
+               (input (buffer-substring-no-properties start end))
+               (default-enable-multibyte-characters nil))
             (with-temp-buffer
               (when passphrase
                 (insert passphrase "\n"))
@@ -88,17 +89,18 @@
          (delete-file output-file-name))
       (set-default-file-modes orig-mode))))
 
-(defun pgg-gpg-possibly-cache-passphrase (passphrase)
+(defun pgg-gpg-possibly-cache-passphrase (passphrase &optional key)
   (if (and pgg-cache-passphrase
           (progn
             (goto-char (point-min))
             (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t)))
       (pgg-add-passphrase-cache
-       (progn
-        (goto-char (point-min))
-        (if (re-search-forward
-             "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t)
-            (substring (match-string 0) -8)))
+       (or key
+          (progn
+            (goto-char (point-min))
+            (if (re-search-forward
+                 "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t)
+                (substring (match-string 0) -8))))
        passphrase)))
 
 (defun pgg-gpg-lookup-key (string &optional type)
@@ -124,7 +126,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
          (when sign
            (pgg-read-passphrase
             (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
-            (pgg-gpg-lookup-key pgg-gpg-user-id 'encrypt))))
+            pgg-gpg-user-id)))
         (args
          (append
           (list "--batch" "--armor" "--always-trust" "--encrypt")
@@ -140,7 +142,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
       (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
     (when sign
       (with-current-buffer pgg-errors-buffer
-       (pgg-gpg-possibly-cache-passphrase passphrase)))
+       (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)))
     (pgg-process-when-success)))
 
 (defun pgg-gpg-decrypt-region (start end)
@@ -149,11 +151,11 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
         (passphrase
          (pgg-read-passphrase
           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
-          (pgg-gpg-lookup-key pgg-gpg-user-id 'encrypt)))
+          pgg-gpg-user-id))
         (args '("--batch" "--decrypt")))
     (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (with-current-buffer pgg-errors-buffer
-      (pgg-gpg-possibly-cache-passphrase passphrase)
+      (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
       (goto-char (point-min))
       (re-search-forward "^\\[GNUPG:] DECRYPTION_OKAY\\>" nil t))))
 
@@ -163,7 +165,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
         (passphrase
          (pgg-read-passphrase
           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
-          (pgg-gpg-lookup-key pgg-gpg-user-id 'sign)))
+          pgg-gpg-user-id))
         (args
          (list (if cleartext "--clearsign" "--detach-sign")
                "--armor" "--batch" "--verbose"
@@ -173,7 +175,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
     (pgg-as-lbt start end 'CRLF
       (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
     (with-current-buffer pgg-errors-buffer
-      (pgg-gpg-possibly-cache-passphrase passphrase))
+      (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id))
     (pgg-process-when-success)))
 
 (defun pgg-gpg-verify-region (start end &optional signature)