#include <lib-mime/mime.h>
#include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "handler.h"
|| (option (OPTPGPLONGIDS)
&& !m_strncasecmp(p, "0x", 2)
&& !m_strcasecmp(p + 2, crypt_keyid (k) + 8))
- || str_isstr (k->uid, p)) {
+ || m_stristr(k->uid, p)) {
crypt_key_t *tmp;
debug_print (5, ("match.\n"));
if (whatfor) {
if (l)
- str_replace (&l->dflt, resp);
+ m_strreplace(&l->dflt, resp);
else {
l = p_new(struct crypt_cache, 1);
l->next = id_defaults;
is_smime ? APPLICATION_SMIME :
APPLICATION_PGP, NULL))) {
snprintf (input_signas, sizeof (input_signas), "0x%s", crypt_keyid (p));
- str_replace (is_smime ? &SmimeDefaultKey : &PgpSignAs,
+ m_strreplace(is_smime ? &SmimeDefaultKey : &PgpSignAs,
input_signas);
crypt_free_key (&p);