X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=smime.c;h=e9f64f1bdd7fc4ba4dfda00e397705210a60b5d5;hp=1bad22a88275cc326076ba32f4247dc0e826dcc9;hb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/smime.c b/smime.c
index 1bad22a..e9f64f1 100644
--- 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;
@@ -721,7 +719,7 @@ void smime_getkeys (ENVELOPE * env)
     }
   if (!found && (t = mutt_default_from ())) {
     _smime_getkeys (t->mailbox);
-    rfc822_free_address (&t);
+    address_delete (&t);
   }
 }
 
@@ -756,7 +754,7 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
       abort ();
     }
 
-    *last = rfc822_cpy_adr (p);
+    *last = address_list_dup (p);
     while (*last)
       last = &((*last)->next);
   }
@@ -778,8 +776,8 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
     if (!keyID) {
       mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
       p_delete(&keylist);
-      rfc822_free_address (&tmp);
-      rfc822_free_address (&addr);
+      address_delete (&tmp);
+      address_delete (&addr);
       return NULL;
     }
 
@@ -788,10 +786,10 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
     sprintf (keylist + keylist_used, "%s\n", keyID);    /* __SPRINTF_CHECKED__ */
     keylist_used = m_strlen(keylist);
 
-    rfc822_free_address (&addr);
+    address_delete (&addr);
 
   }
-  rfc822_free_address (&tmp);
+  address_delete (&tmp);
   return (keylist);
 }
 
@@ -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;
@@ -1906,10 +1900,10 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: DES, 2: Triple-DES "),
                                                 _("dt"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "des");
+                m_strreplace(&SmimeCryptAlg, "des");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "des3");
+                m_strreplace(&SmimeCryptAlg, "des3");
                 break;
             }
             break;
@@ -1918,13 +1912,13 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: RC2-40, 2: RC2-64, 3: RC2-128 "),
                                                 _("468"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "rc2-40");
+                m_strreplace(&SmimeCryptAlg, "rc2-40");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "rc2-64");
+                m_strreplace(&SmimeCryptAlg, "rc2-64");
                 break;
               case 3:
-                str_replace (&SmimeCryptAlg, "rc2-128");
+                m_strreplace(&SmimeCryptAlg, "rc2-128");
                 break;
             }
             break;
@@ -1933,13 +1927,13 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: AES128, 2: AES192, 3: AES256 "),
                                                 _("895"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "aes128");
+                m_strreplace(&SmimeCryptAlg, "aes128");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "aes192");
+                m_strreplace(&SmimeCryptAlg, "aes192");
                 break;
               case 3:
-                str_replace (&SmimeCryptAlg, "aes256");
+                m_strreplace(&SmimeCryptAlg, "aes256");
                 break;
             }
             break;
@@ -1969,7 +1963,7 @@ int smime_send_menu (HEADER * msg, int *redraw)
   case 4:                      /* sign (a)s */
 
     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) {
-      str_replace (&SmimeDefaultKey, p);
+      m_strreplace(&SmimeDefaultKey, p);
 
       msg->security |= SIGN;
 
@@ -2001,6 +1995,3 @@ int smime_send_menu (HEADER * msg, int *redraw)
 
   return (msg->security);
 }
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_SMIME */