Changeset 4129:8c97980f1af1

Timestamp:

2005-08-01 22:58:18 (3 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

More fiddling with PGP results. When rerunning PGP on a message, clear
old security result bits to avoid confusing messages like 'decrypt failed;
PGP signature successfully verified'.

Files:

• commands.c (modified) (1 diff)
• pgp.c (modified) (7 diffs)

commands.c

@@ -167 +167 @@
   {
     /* update crypto information for this message */
+    cur->security &= ~(GOODSIGN|BADSIGN);
     cur->security |= crypt_query (cur->content);
   

pgp.c

@@ -376 +376 @@
             if (rc == -1 || rv) maybe_goodsig = 0;
 
-            state_putc ('\n', s);
             state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
           }
@@ -388 +387 @@
         pgp_void_passphrase ();
 
-        safe_fclose (&tmpfp);
-        mutt_unlink (tmpfname);
-        safe_fclose (&pgpout);
-        mutt_unlink (outfile);
-        return;
+        goto out;
       }
       /*
@@ -441 +436 @@
           state_attach_puts (_("[-- END PGP SIGNED MESSAGE --]\n"), s);
       }
-
-      if (tmpfp)
-      {
-        safe_fclose (&tmpfp);
-        mutt_unlink (tmpfname);
-      }
-      if (pgpout)
-      {
-        safe_fclose (&pgpout);
-        mutt_unlink (outfile);
-      }
     }
     else
@@ -462 +446 @@
   }
 
+out:
   m->goodsig = (maybe_goodsig && have_any_sigs);
 
+  if (tmpfp)
+  {
+    safe_fclose (&tmpfp);
+    mutt_unlink (tmpfname);
+  }
+  if (pgpout)
+  {
+    safe_fclose (&pgpout);
+    mutt_unlink (outfile);
+  }
+  
   if (needpass == -1)
   {
@@ -745 +741 @@
   char pgptmpfile[_POSIX_PATH_MAX];
   pid_t thepid;
+  int rv;
   
   mutt_mktemp (pgperrfile);
@@ -800 +797 @@
 
   fclose (pgpout);
-  mutt_wait_filter (thepid);
+  rv = mutt_wait_filter (thepid);
   mutt_unlink(pgptmpfile);
   
@@ -807 +804 @@
     fflush (pgperr);
     rewind (pgperr);
-    if (pgp_copy_checksig (pgperr, s->fpout) == 0 && p)
+    if (pgp_copy_checksig (pgperr, s->fpout) == 0 && !rv && p)
       p->goodsig = 1;
+    else
+      p->goodsig = 0;
     state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
   }