always build mutt with pgp + smime support.

[apps/madmutt.git] / smime.c

diff --git a/smime.c b/smime.c
index 3db7185..e9f64f1 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -49,8 +49,6 @@
 # include <sys/resource.h>
 #endif
 
-#ifdef CRYPT_BACKEND_CLASSIC_SMIME
-
 #include "mutt_crypt.h"
 
 struct smime_command_context {
@@ -414,7 +412,7 @@ char *smime_ask_for_key (char *prompt, char *mailbox, short public)
         continue;
 
       /* Check if query matches this certificate */
-      if (!str_isstr (fields[0], qry) && !str_isstr (fields[2], qry))
+      if (!m_stristr(fields[0], qry) && !m_stristr(fields[2], qry))
         continue;
 
       Table[cur].hash = hash;
@@ -1880,12 +1878,8 @@ int smime_send_menu (HEADER * msg, int *redraw)
 {
   char *p;
 
-  if (!(WithCrypto & APPLICATION_SMIME))
-    return msg->security;
-
   switch (mutt_multi_choice
-          (_
-           ("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "),
+          (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "),
            _("eswabfc"))) {
   case 1:                      /* (e)ncrypt */
     msg->security |= ENCRYPT;
@@ -2001,6 +1995,3 @@ int smime_send_menu (HEADER * msg, int *redraw)
 
   return (msg->security);
 }
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_SMIME */