This commit was generated by cvs2svn to compensate for changes in r8000,

[elisp/gnus.git-] / lisp / pgg-pgp.el

diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 4eb76ee..d4bfb7b 100644 (file)
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -1,6 +1,7 @@
 ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
 
-;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -30,7 +31,7 @@
   (require 'pgg))
 
 (defgroup pgg-pgp ()
-  "PGP 2.* and 6.* interface"
+  "PGP 2.* and 6.* interface."
   :group 'pgg)
 
 (defcustom pgg-pgp-program "pgp"
@@ -131,39 +132,57 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
                 (buffer-substring (point)(progn (end-of-line) (point)))))
         2))))))
 
-(defun pgg-pgp-encrypt-region (start end recipients)
+(defun pgg-pgp-encrypt-region (start end recipients &optional sign passphrase)
   "Encrypt the current region between START and END."
   (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
+        (passphrase (or passphrase
+                        (when sign
+                          (pgg-read-passphrase
+                           (format "PGP passphrase for %s: "
+                                   pgg-pgp-user-id)
+                           pgg-pgp-user-id))))
         (args
-         `("+encrypttoself=off +verbose=1" "+batchmode"
-           "+language=us" "-fate"
-           ,@(if recipients
-                 (mapcar (lambda (rcpt) (concat "\"" rcpt "\""))
-                         (append recipients
-                                 (if pgg-encrypt-for-me
-                                     (list pgg-pgp-user-id))))))))
+         (append
+          `("+encrypttoself=off +verbose=1" "+batchmode"
+            "+language=us" "-fate"
+            ,@(if recipients
+                  (mapcar (lambda (rcpt) (concat "\"" rcpt "\""))
+                          (append recipients
+                                  (if pgg-encrypt-for-me
+                                      (list pgg-pgp-user-id))))))
+          (if sign '("-s" "-u" pgg-pgp-user-id)))))
     (pgg-pgp-process-region start end nil pgg-pgp-program args)
     (pgg-process-when-success nil)))
 
-(defun pgg-pgp-decrypt-region (start end)
-  "Decrypt the current region between START and END."
+(defun pgg-pgp-decrypt-region (start end &optional passphrase)
+  "Decrypt the current region between START and END.
+
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user."
   (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
+        (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))
         (passphrase
-         (pgg-read-passphrase
-          (format "PGP passphrase for %s: " pgg-pgp-user-id)
-          (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)))
+         (or passphrase
+             (pgg-read-passphrase
+              (format "PGP passphrase for %s: " pgg-pgp-user-id) key)))
         (args
-         '("+verbose=1" "+batchmode" "+language=us" "-f")))
+          '("+verbose=1" "+batchmode" "+language=us" "-f")))
     (pgg-pgp-process-region start end passphrase pgg-pgp-program args)
-    (pgg-process-when-success nil)))
+    (pgg-process-when-success
+      (if pgg-cache-passphrase
+         (pgg-add-passphrase-to-cache key passphrase)))))
 
-(defun pgg-pgp-sign-region (start end &optional clearsign)
-  "Make detached signature from text between START and END."
+(defun pgg-pgp-sign-region (start end &optional clearsign passphrase)
+  "Make detached signature from text between START and END.
+
+If optional PASSPHRASE is not specified, it will be obtained from the
+passphrase cache or user."
   (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id))
         (passphrase
-         (pgg-read-passphrase
-          (format "PGP passphrase for %s: " pgg-pgp-user-id)
-          (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))
+         (or passphrase
+             (pgg-read-passphrase
+              (format "PGP passphrase for %s: " pgg-pgp-user-id)
+              (pgg-pgp-lookup-key pgg-pgp-user-id 'sign))))
         (args
          (list (if clearsign "-fast" "-fbast")
                "+verbose=1" "+language=us" "+batchmode"
@@ -178,7 +197,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
                                    (point))
                             (point-max))))))
          (if pgg-cache-passphrase
-             (pgg-add-passphrase-cache
+             (pgg-add-passphrase-to-cache
               (cdr (assq 'key-identifier packet))
               passphrase)))))))
 
@@ -194,9 +213,11 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
                jka-compr-compression-info-list jam-zcat-filename-list)
            (write-region start end orig-file)))
       (set-default-file-modes orig-mode))
-    (when (stringp signature)
-      (copy-file signature (setq signature (concat orig-file ".asc")))
-      (setq args (append args (list signature orig-file))))
+    (if (stringp signature)
+       (progn
+         (copy-file signature (setq signature (concat orig-file ".asc")))
+         (setq args (append args (list signature orig-file))))
+      (setq args (append args (list orig-file))))
     (pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
     (delete-file orig-file)
     (if signature (delete-file signature))
@@ -236,4 +257,5 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
 
 (provide 'pgg-pgp)
 
+;;; arch-tag: 076b7801-37b2-49a6-97c3-218fdecde33c
 ;;; pgg-pgp.el ends here