[patch-0.94.5i.tlr.pgp_fixes.1] This patch fixes various

pgp-related issues.  In particular, mutt won't segfault
when trying to decrypt-save messages from the index, and
the presence of a PGP-encrypted body part on the
attachment menu will no longer confuse the MIME parser.

1 files changed, 2 insertions, 7 deletions

diff --git a/handler.c b/handler.c
index 6575a573..eeebed74 100644
--- a/handler.c
+++ b/handler.c
@@ -934,9 +934,7 @@ int mutt_can_decode (BODY *a)
 #ifdef _PGPPATH
   else if (a->type == TYPEAPPLICATION)
   {
-    if (mutt_is_pgp_subtype(a->subtype) || 
-	strcasecmp (a->subtype, "pgp-signed") == 0 ||
-	strcasecmp (a->subtype, "pgp-keys") == 0)
+    if (mutt_is_application_pgp(a))
       return (1);
   }
 #endif
@@ -1241,10 +1239,7 @@ void mutt_body_handler (BODY *b, STATE *s)
 #ifdef _PGPPATH
   else if (b->type == TYPEAPPLICATION)
   {
-    if (mutt_is_pgp_subtype(b->subtype) || 
-	strcasecmp ("pgp-signed", b->subtype) == 0 ||
-	strcasecmp ("pgp-keys", b->subtype) == 0)
-      
+    if (mutt_is_application_pgp(b))
       handler = application_pgp_handler;
   }
 #endif /* _PGPPATH */