diff options
| author | Simon Josefsson | 2005-10-08 08:43:33 +0000 |
|---|---|---|
| committer | Simon Josefsson | 2005-10-08 08:43:33 +0000 |
| commit | 82259e507db63f0da997b4df69b280d8d55c0f58 (patch) | |
| tree | e3ef7428cd08307cc4e70fc3971f14abf96a49b0 | |
| parent | 46f934722e506acf05a5efefb97bd114ad7a40b8 (diff) | |
| download | emacs-82259e507db63f0da997b4df69b280d8d55c0f58.tar.gz emacs-82259e507db63f0da997b4df69b280d8d55c0f58.zip | |
* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,
tiny patch from "Georg C. F. Greve" <greve@gnu.org>.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/pgg-gpg.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0d58f8046ee..91fab639f78 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-05-09 Simon Josefsson <jas@extundo.com> | ||
| 2 | |||
| 3 | * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching, | ||
| 4 | tiny patch from "Georg C. F. Greve" <greve@gnu.org>. | ||
| 5 | |||
| 1 | 2005-10-08 Simon Josefsson <jas@extundo.com> | 6 | 2005-10-08 Simon Josefsson <jas@extundo.com> |
| 2 | 7 | ||
| 3 | * pgg-def.el (top-level): Don't require custom, it is | 8 | * pgg-def.el (top-level): Don't require custom, it is |
diff --git a/lisp/gnus/pgg-gpg.el b/lisp/gnus/pgg-gpg.el index f012a9d8506..6ba017c731c 100644 --- a/lisp/gnus/pgg-gpg.el +++ b/lisp/gnus/pgg-gpg.el | |||
| @@ -100,13 +100,13 @@ | |||
| 100 | (if (and pgg-cache-passphrase | 100 | (if (and pgg-cache-passphrase |
| 101 | (progn | 101 | (progn |
| 102 | (goto-char (point-min)) | 102 | (goto-char (point-min)) |
| 103 | (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t))) | 103 | (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t))) |
| 104 | (pgg-add-passphrase-cache | 104 | (pgg-add-passphrase-cache |
| 105 | (or key | 105 | (or key |
| 106 | (progn | 106 | (progn |
| 107 | (goto-char (point-min)) | 107 | (goto-char (point-min)) |
| 108 | (if (re-search-forward | 108 | (if (re-search-forward |
| 109 | "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t) | 109 | "^\\[GNUPG:] NEED_PASSPHRASE\\(_PIN\\)? \\w+ ?\\w*" nil t) |
| 110 | (substring (match-string 0) -8)))) | 110 | (substring (match-string 0) -8)))) |
| 111 | passphrase))) | 111 | passphrase))) |
| 112 | 112 | ||