diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/pgg-pgp.el | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4f1a6077e18..f6167098ac7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-01-21 Derek Atkins <warlord@MIT.EDU> (tiny change) | ||
| 2 | |||
| 3 | * pgg-pgp.el (pgg-pgp-decrypt-region): Use passphrase cache. | ||
| 4 | |||
| 1 | 2005-10-08 Simon Josefsson <jas@extundo.com> | 5 | 2005-10-08 Simon Josefsson <jas@extundo.com> |
| 2 | 6 | ||
| 3 | * pgg-parse.el (top-level): Don't require custom, it is | 7 | * pgg-parse.el (top-level): Don't require custom, it is |
diff --git a/lisp/gnus/pgg-pgp.el b/lisp/gnus/pgg-pgp.el index 88f1d697200..2735a0b7b27 100644 --- a/lisp/gnus/pgg-pgp.el +++ b/lisp/gnus/pgg-pgp.el | |||
| @@ -149,14 +149,16 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." | |||
| 149 | (defun pgg-pgp-decrypt-region (start end) | 149 | (defun pgg-pgp-decrypt-region (start end) |
| 150 | "Decrypt the current region between START and END." | 150 | "Decrypt the current region between START and END." |
| 151 | (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) | 151 | (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) |
| 152 | (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)) | ||
| 152 | (passphrase | 153 | (passphrase |
| 153 | (pgg-read-passphrase | 154 | (pgg-read-passphrase |
| 154 | (format "PGP passphrase for %s: " pgg-pgp-user-id) | 155 | (format "PGP passphrase for %s: " pgg-pgp-user-id) key)) |
| 155 | (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt))) | ||
| 156 | (args | 156 | (args |
| 157 | '("+verbose=1" "+batchmode" "+language=us" "-f"))) | 157 | '("+verbose=1" "+batchmode" "+language=us" "-f"))) |
| 158 | (pgg-pgp-process-region start end passphrase pgg-pgp-program args) | 158 | (pgg-pgp-process-region start end passphrase pgg-pgp-program args) |
| 159 | (pgg-process-when-success nil))) | 159 | (pgg-process-when-success |
| 160 | (if pgg-cache-passphrase | ||
| 161 | (pgg-add-passphrase-cache key passphrase))))) | ||
| 160 | 162 | ||
| 161 | (defun pgg-pgp-sign-region (start end &optional clearsign) | 163 | (defun pgg-pgp-sign-region (start end &optional clearsign) |
| 162 | "Make detached signature from text between START and END." | 164 | "Make detached signature from text between START and END." |