-
- if (!(a && a->next && a->next->type == protocol_major &&
- !m_strcasecmp(a->next->subtype, protocol_minor))) {
- state_attach_puts (_("[-- Error: "
- "Inconsistent multipart/signed structure! --]\n\n"),
- s);
- return mutt_body_handler (a, s);
- }
-
-
- if (protocol_major == TYPEAPPLICATION
- && !m_strcasecmp(protocol_minor, "pgp-signature"));
- else if (protocol_major == TYPEAPPLICATION
- && !(m_strcasecmp(protocol_minor, "x-pkcs7-signature")
- && m_strcasecmp(protocol_minor, "pkcs7-signature")));
- else if (protocol_major == TYPEMULTIPART
- && !m_strcasecmp(protocol_minor, "mixed"));
- else {
- state_printf (s, _("[-- Error: "
- "Unknown multipart/signed protocol %s! --]\n\n"),
- protocol);
+ if (!(a && a->next && a->next->type == major &&
+ mime_which_token(a->next->subtype, -1) == minor))
+ {
+ state_attach_puts(_("[-- Error: "
+ "Inconsistent multipart/signed structure! --]\n\n"),
+ s);