Changeset 3646:2b649fd03f1e

Timestamp:

2004-04-12 13:33:33 (5 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

A belated fix for #1808 (Debian #233106): Make sure
check-traditional-pgp doesn't leave the pager context unnecessarily.
This makes message-hooks like this one safe:

message-hook '!(~g|~G) ~b"^{-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' \}

"exec check-traditional-pgp"

Files:

• commands.c (modified) (2 diffs)
• curs_main.c (modified) (1 diff)
• mutt.h (modified) (1 diff)
• mutt_crypt.h (modified) (1 diff)
• pager.c (modified) (1 diff)
• recvattach.c (modified) (1 diff)

commands.c

@@ -942 +942 @@
   int rv = 0;
   
+  h->security |= PGP_TRADITIONAL_CHECKED;
+  
   mutt_parse_mime_message (Context, h);
   if ((msg = mx_open_message (Context, h->msgno)) == NULL)
@@ -960 +962 @@
   int i;
   int rv = 0;
-  if (h)
+  if (h && !(h->security & PGP_TRADITIONAL_CHECKED))
     rv = _mutt_check_traditional_pgp (h, redraw);
   else
   {
     for (i = 0; i < Context->vcount; i++)
-      if (Context->hdrs[Context->v2r[i]]->tagged)
+      if (Context->hdrs[Context->v2r[i]]->tagged && !(h->security & PGP_TRADITIONAL_CHECKED))
         rv = _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw)
           || rv;

curs_main.c

@@ -1877 +1877 @@
         CHECK_MSGCOUNT; 
         CHECK_VISIBLE;
-        mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+        if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) 
+          mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+      
         if (menu->menu == MENU_PAGER)
         {

mutt.h

@@ -642 +642 @@
 typedef struct header
 {
-  unsigned int security : 9;  /* bit 0-6: flags, bit 7,8: application.
+  unsigned int security : 10;  /* bit 0-6: flags, bit 7,8: application.
                                  see: crypt.h pgplib.h, smime.h */
 

mutt_crypt.h

@@ -42 +42 @@
 #define APPLICATION_SMIME  (1 << 8)
 
+#define PGP_TRADITIONAL_CHECKED (1 << 9)
+
 #define PGPENCRYPT  (APPLICATION_PGP | ENCRYPT)
 #define PGPSIGN     (APPLICATION_PGP | SIGN)

pager.c

@@ -2174 +2174 @@
         redraw = REDRAW_FULL;
         break;
+
+      case OP_CHECK_TRADITIONAL:
+        CHECK_MODE (IsHeader (extra));
+        if (!(WithCrypto & APPLICATION_PGP))
+          break;
+        if (!(extra->hdr->security & PGP_TRADITIONAL_CHECKED)) 
+        {
+          ch = -1;
+          rc = OP_CHECK_TRADITIONAL;
+        }
+        break;
       
       case OP_CREATE_ALIAS:

recvattach.c

@@ -817 +817 @@
       /* functions which are passed through from the pager */
       case OP_CHECK_TRADITIONAL:
-        if (!(WithCrypto & APPLICATION_PGP))
+        if (!(WithCrypto & APPLICATION_PGP) || (hdr && hdr->security & PGP_TRADITIONAL_CHECKED))
         {
           op = OP_NULL;