X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pgpkey.c;h=b31676a5ec5985c42f911f36f4929670c25c2f19;hb=51c07577bff89fde3038940cc06ac01bc28557b9;hp=62d050e87054382d97862db1dfb28807f80f3593;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;p=apps%2Fmadmutt.git

diff --git a/pgpkey.c b/pgpkey.c
index 62d050e..b31676a 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -40,8 +40,6 @@
 
 #include <locale.h>
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 struct pgp_cache {
   char *what;
   char *dflt;
@@ -662,7 +660,7 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
 
     if (whatfor) {
       if (l)
-        str_replace (&l->dflt, resp);
+        m_strreplace(&l->dflt, resp);
       else {
         l = p_new(struct pgp_cache, 1);
         l->next = id_defaults;
@@ -861,7 +859,7 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
           this_key_has_weak = 1;
       }
 
-      rfc822_free_address (&r);
+      address_delete (&r);
     }
 
     if (match && !this_key_has_strong && this_key_has_invalid)
@@ -939,7 +937,7 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
               && !m_strcasecmp(p + 2, pgp_keyid (k)))
           || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, k->keyid + 8))
-          || str_isstr (a->addr, p)) {
+          || m_stristr(a->addr, p)) {
         debug_print (5, ("match.\n"));
         match = 1;
         break;
@@ -966,6 +964,3 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
   return NULL;
 }
 
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */