<<< Date Index >>>     <<< Thread Index >>>

Re: 1.5.10 pgp handling broken



On Wednesday, 24 August 2005 at 11:31, Lars Hecking wrote:
> Paul Walker writes:
> > On Tue, Aug 23, 2005 at 09:39:13AM +0100, Lars Hecking wrote:
> > 
> > >  process and got dumped straight into the pager. Under 1.5.10, I get only
> > >  a warning message "Could not copy message"; I effectively cannot read
> > >  this particular message quickly, I have to wait around 80s (gpg timeout)
> > 
> > So you get that message while it's blocked waiting for gpg to finish...? Or
> > did I misunderstand?
>  
>  I get that message when I'm trying to ^C out of gpg, while mutt shows the
>  "Invoking PGP..." message.
> 
>  One further piece of information: this only happens for old-style pgp
>  signatures. It works just fine for PGP/MIME. This is how gpg is involved
>  for PGP/MIME:

I'm afraid I'm not in a position to test right now, but maybe the following
patch against CVS fixes it?

And now I'm off to the airport...
Index: pgp.c
===================================================================
RCS file: /home/roessler/cvs/mutt/pgp.c,v
retrieving revision 3.53
diff -u -p -r3.53 pgp.c
--- pgp.c       22 Aug 2005 20:30:11 -0000      3.53
+++ pgp.c       24 Aug 2005 14:27:41 -0000
@@ -387,7 +387,7 @@ int pgp_application_pgp_handler (BODY *m
          c = fgetc (pgpout);
          ungetc (c, pgpout);
        }
-        if (!pgpout || c == EOF)
+        if (!clearsign && (!pgpout || c == EOF))
        {
           mutt_error _("Could not decrypt PGP message");
          mutt_sleep (1);