[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, 3 deletions

diff --git a/sendlib.c b/sendlib.c
index 883eb918..6ff67552 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -954,14 +954,13 @@ BODY *mutt_make_message_attach (CONTEXT *ctx, HEADER *hdr, int attach_msg)
     if(option(OPTFORWDECRYPT)
        && (hdr->pgp & PGPENCRYPT))
   {
-    if(hdr->content->type == TYPEMULTIPART)
+    if(mutt_is_multipart_encrypted(hdr->content))
     {
       chflags |= CH_MIME | CH_NONEWLINE;
       cmflags = M_CM_DECODE_PGP;
       pgp &= ~PGPENCRYPT;
     }
-    else if((hdr->content->type == TYPEAPPLICATION) &&
-	    mutt_is_pgp_subtype(hdr->content->subtype))
+    else if(mutt_is_application_pgp(hdr->content) & PGPENCRYPT)
     {
       chflags |= CH_MIME | CH_TXTPLAIN;
       cmflags = M_CM_DECODE;