- dprint (5,
- (debugfile,
- "pgp_getkeybystr: matching \"%s\" against key %s, \"%s\": ", p,
- pgp_keyid (k), a->addr));
- if (!*p || mutt_strcasecmp (p, pgp_keyid (k)) == 0
- || (!mutt_strncasecmp (p, "0x", 2)
- && !mutt_strcasecmp (p + 2, pgp_keyid (k)))
- || (option (OPTPGPLONGIDS) && !mutt_strncasecmp (p, "0x", 2)
- && !mutt_strcasecmp (p + 2, k->keyid + 8))
- || mutt_stristr (a->addr, p)) {
- dprint (5, (debugfile, "match.\n"));
+ debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr));
+ if (!*p || safe_strcasecmp (p, pgp_keyid (k)) == 0
+ || (!safe_strncasecmp (p, "0x", 2)
+ && !safe_strcasecmp (p + 2, pgp_keyid (k)))
+ || (option (OPTPGPLONGIDS) && !safe_strncasecmp (p, "0x", 2)
+ && !safe_strcasecmp (p + 2, k->keyid + 8))
+ || str_isstr (a->addr, p)) {
+ debug_print (5, ("match.\n"));