X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=762842b008b2d8f0fc8932f8d6235490361a864f;hb=10b7c16c8905d1b7ceaeeb6cfab9ad2ec03d8780;hp=ef99d758b770b014e9586d629e77020701ed58fa;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9;p=apps%2Fmadmutt.git diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c index ef99d75..762842b 100644 --- a/lib-crypt/pgpkey.c +++ b/lib-crypt/pgpkey.c @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -739,7 +738,7 @@ BODY *pgp_make_key_attachment (char *tempf) fclose (tempfp); fclose (devnull); - att = mutt_new_body (); + att = body_new(); att->filename = m_strdup(tempf); att->unlink = 1; att->use_disp = 0; @@ -814,16 +813,10 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring) if (!keys) return NULL; - debug_print (5, ("looking for %s <%s>\n", a->personal, a->mailbox)); - for (k = keys; k; k = kn) { kn = k->next; - debug_print (5, (" looking at key: %s\n", pgp_keyid (k))); - if (abilities && !(k->flags & abilities)) { - debug_print (5, (" insufficient abilities: Has %x, want %x\n", - k->flags, abilities)); continue; } @@ -929,14 +922,12 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring) match = 0; for (a = k->address; a; a = a->next) { - debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr)); if (!*p || m_strcasecmp(p, pgp_keyid (k)) == 0 || (!m_strncasecmp(p, "0x", 2) && !m_strcasecmp(p + 2, pgp_keyid (k))) || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2) && !m_strcasecmp(p + 2, k->keyid + 8)) || m_stristr(a->addr, p)) { - debug_print (5, ("match.\n")); match = 1; break; }