emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/pgg-pgp.el


From: Eli Zaretskii
Subject: [Emacs-diffs] Changes to emacs/lisp/pgg-pgp.el
Date: Fri, 04 Nov 2005 09:41:03 -0500

Index: emacs/lisp/pgg-pgp.el
diff -c emacs/lisp/pgg-pgp.el:1.1 emacs/lisp/pgg-pgp.el:1.2
*** emacs/lisp/pgg-pgp.el:1.1   Mon Oct 24 09:46:27 2005
--- emacs/lisp/pgg-pgp.el       Fri Nov  4 14:41:02 2005
***************
*** 132,172 ****
                 (buffer-substring (point)(progn (end-of-line) (point)))))
         2))))))
  
! (defun pgg-pgp-encrypt-region (start end recipients)
    "Encrypt the current region between START and END."
    (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-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))))))))
      (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."
    (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) key))
         (args
!         '("+verbose=1" "+batchmode" "+language=us" "-f")))
      (pgg-pgp-process-region start end passphrase pgg-pgp-program args)
      (pgg-process-when-success
        (if pgg-cache-passphrase
!         (pgg-add-passphrase-cache key passphrase)))))
  
! (defun pgg-pgp-sign-region (start end &optional clearsign)
!   "Make detached signature from text between START and END."
    (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)))
         (args
          (list (if clearsign "-fast" "-fbast")
                "+verbose=1" "+language=us" "+batchmode"
--- 132,188 ----
                 (buffer-substring (point)(progn (end-of-line) (point)))))
         2))))))
  
! (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
!           (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 &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
!           (or passphrase
!               (pgg-read-passphrase
!                (format "PGP passphrase for %s: " pgg-pgp-user-id) key)))
         (args
!           '("+verbose=1" "+batchmode" "+language=us" "-f")))
      (pgg-pgp-process-region start end passphrase pgg-pgp-program args)
      (pgg-process-when-success
        (if pgg-cache-passphrase
!         (pgg-add-passphrase-to-cache key passphrase)))))
! 
! (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
!           (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"
***************
*** 181,187 ****
                                    (point))
                             (point-max))))))
          (if pgg-cache-passphrase
!             (pgg-add-passphrase-cache
               (cdr (assq 'key-identifier packet))
               passphrase)))))))
  
--- 197,203 ----
                                    (point))
                             (point-max))))))
          (if pgg-cache-passphrase
!             (pgg-add-passphrase-to-cache
               (cdr (assq 'key-identifier packet))
               passphrase)))))))
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]