always build mutt with pgp + smime support.

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index d388924..335337e 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -180,8 +180,8 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
       if (pat->op != M_HEADER) {
         mutt_parse_mime_message (ctx, h);
 
-        if (WithCrypto && (h->security & ENCRYPT)
-            && !crypt_valid_passphrase (h->security)) {
+        if ((h->security & ENCRYPT) && !crypt_valid_passphrase (h->security))
+        {
           mx_close_message (&msg);
           if (fp) {
             fclose (fp);
@@ -1069,20 +1069,12 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
   case M_COLLAPSED:
     return (pat->not ^ (h->collapsed && h->num_hidden > 1));
   case M_CRYPT_SIGN:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & SIGN) ? 1 : 0));
   case M_CRYPT_VERIFIED:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & GOODSIGN) ? 1 : 0));
   case M_CRYPT_ENCRYPT:
-    if (!WithCrypto)
-      break;
     return (pat->not ^ ((h->security & ENCRYPT) ? 1 : 0));
   case M_PGP_KEY:
-    if (!(WithCrypto & APPLICATION_PGP))
-      break;
     return (pat->not ^ ((h->security & APPLICATION_PGP)
                         && (h->security & PGPKEY)));
   case M_XLABEL: