Ticket #39362: patch-1.5.20.crypt.c

--- mutt-1.5.20/crypt.c Sat Feb 23 03:12:43 2013 +0000
+++ mutt-1.5.20/crypt.c Mon Mar 04 16:43:09 2013 -0800
@@ -766,6 +766,29 @@
 
 
 /*
+ * This routine addresses inconsistencies in the protocol of
+ * "multipart/signed" messages and the Content-Type of their 
+ * parts.
+ */
+
+int mutt_xless_strcasecmp(const char *a, const char *b)
+{
+  const char* aPrime;
+  const char* bPrime;
+  if (strcasestr(NONULL(a), "x-") == a)
+    aPrime = a + 2;
+  else
+    aPrime = a;
+  if (strcasestr(NONULL(b), "x-") == b)
+    bPrime = b + 2;
+  else
+    bPrime = b;
+
+  return strcasecmp(NONULL(aPrime), NONULL(bPrime));
+}
+
+
+/*
  * This routine verifies a  "multipart/signed"  body.
  */
 
@@ -808,7 +831,7 @@
   /* consistency check */
 
   if (!(a && a->next && a->next->type == protocol_major && 
-      !mutt_strcasecmp (a->next->subtype, protocol_minor)))
+      !mutt_xless_strcasecmp (a->next->subtype, protocol_minor)))
   {
     state_attach_puts (_("[-- Error: "
                          "Inconsistent multipart/signed structure! --]\n\n"),