Changeset 5437:48e90b82a4ee for handler.c

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:

• handler.c (modified) (1 diff)

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;
   }