- 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)) {
+ 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)) {