Changeset 5437:48e90b82a4ee

Timestamp:

2008-07-01 14:49:21 (5 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Handle DONTHANDLEPGPKEYS in handler instead of crypto modules.
This lets gpgme and classic pgp share a bit of logic, and unbreaks key
extraction at least for classic PGP.

Files:

• ChangeLog (modified) (1 diff)
• crypt-gpgme.c (modified) (1 diff)
• handler.c (modified) (1 diff)
• pgp.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-07-01 13:32 -0700  Brendan Cully  <brendan@kublai.com>  (17525e17fa7b)
+
+        * copy.c: Bail out of copy if decryption is requested but the desired
+        engine is missing. This closes #2684, but handling of mixed crypto
+        in a single message needs more investigation.
+
+2008-07-01 01:10 -0700  rtc  <rtc@gmx.de>  (49fe0292b503)
+
+        * copy.c: When deleting attachments, always print newline
+        separating header from body. Closes #3085.
+
 2008-06-29 01:09 -0700  Brendan Cully  <brendan@kublai.com>  (677e7712d735)
 

crypt-gpgme.c

@@ -2045 +2045 @@
               needpass = 0;
             }
-          else if (!option (OPTDONTHANDLEPGPKEYS) &&
-                   !mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15))
-            {
-              needpass = 0;
-              pgp_keyblock =1;
-            } 
+          else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15))
+          {
+            needpass = 0;
+            pgp_keyblock = 1;
+          } 
           else
             {

handler.c

@@ -1580 +1580 @@
   else if (WithCrypto && b->type == TYPEAPPLICATION)
   {
-    if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+    if (option (OPTDONTHANDLEPGPKEYS)
+        && !ascii_strcasecmp("pgp-keys", b->subtype))
+    {
+      /* pass raw part through for key extraction */
+      plaintext = 1;
+    }
+    else if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
       handler = crypt_pgp_application_pgp_handler;
-    if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime(b))
+    else if ((WithCrypto & APPLICATION_SMIME) && mutt_is_application_smime(b))
       handler = crypt_smime_application_smime_handler;
   }

pgp.c

@@ -294 +294 @@
         needpass = 0;
       }
-      else if (!option (OPTDONTHANDLEPGPKEYS) &&
-               mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0)
+      else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15))
       {
         needpass = 0;
-        pgp_keyblock =1;
+        pgp_keyblock = 1;
       } 
       else