always build mutt with pgp + smime support.

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 504a1e2..989f3ce 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -621,26 +621,23 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
     if (flags & M_CM_REPLYING)
       s.flags |= M_REPLYING;
 
-    if (WithCrypto && flags & M_CM_VERIFY)
+    if (flags & M_CM_VERIFY)
       s.flags |= M_VERIFY;
 
     rc = mutt_body_handler (body, &s);
   }
-  else if (WithCrypto
-           && (flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
+  else if ((flags & M_CM_DECODE_CRYPT) && (hdr->security & ENCRYPT)) {
     BODY *cur;
     FILE *fp;
 
-    if ((WithCrypto & APPLICATION_PGP)
-        && (flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
+    if ((flags & M_CM_DECODE_PGP) && (hdr->security & APPLICATION_PGP) &&
         hdr->content->type == TYPEMULTIPART) {
       if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
         return (-1);
       fputs ("MIME-Version: 1.0\n", fpout);
     }
 
-    if ((WithCrypto & APPLICATION_SMIME)
-        && (flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
+    if ((flags & M_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME)
         && hdr->content->type == TYPEAPPLICATION) {
       if (crypt_smime_decrypt_mime (fpin, &fp, hdr->content, &cur))
         return (-1);