X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=a4549cf0cc719a5aaf455c0c156f37c80c918cb1;hp=ef99d758b770b014e9586d629e77020701ed58fa;hb=35f4e8cefa22d98782a720e4df428a1ce3be2237;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9 diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c index ef99d75..a4549cf 100644 --- a/lib-crypt/pgpkey.c +++ b/lib-crypt/pgpkey.c @@ -17,7 +17,6 @@ #include #include #include -#include #include @@ -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; }