}
if (!found && (t = mutt_default_from ())) {
_smime_getkeys (t->mailbox);
- rfc822_free_address (&t);
+ address_delete (&t);
}
}
abort ();
}
- *last = rfc822_cpy_adr (p);
+ *last = address_list_dup (p);
while (*last)
last = &((*last)->next);
}
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;
}
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);
}
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;
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;
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;
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;