* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,

tiny patch from "Georg C. F. Greve" <greve@gnu.org>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0d58f8046ee63a7230c8afab6d698d5d46b5e68f..91fab639f78c840bc6930f572ee66e2be410eefe 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-09  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Fix PIN caching,
+       tiny patch from "Georg C. F. Greve" <greve@gnu.org>.
+
 2005-10-08  Simon Josefsson  <jas@extundo.com>
 
        * 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 f012a9d8506a06b3f6dd26c5f0cf5c3206e80fcc..6ba017c731cc79e96a16658f598bb69895820823 100644 (file)
--- a/lisp/gnus/pgg-gpg.el
+++ b/lisp/gnus/pgg-gpg.el
@@ -100,13 +100,13 @@
   (if (and pgg-cache-passphrase
           (progn
             (goto-char (point-min))
-            (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t)))
+            (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t)))
       (pgg-add-passphrase-cache
        (or key
           (progn
             (goto-char (point-min))
             (if (re-search-forward
-                 "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t)
+                 "^\\[GNUPG:] NEED_PASSPHRASE\\(_PIN\\)? \\w+ ?\\w*" nil t)
                 (substring (match-string 0) -8))))
        passphrase)))