aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-format-html-display.c3
-rw-r--r--mail/em-format-html.c3
-rw-r--r--mail/em-format.c3
4 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ae20d3b607..573ddc30d3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2003-12-10 Not Zed <NotZed@Ximian.com>
+ * em-format-html-display.c (efhd_multipart_signed):
+ * em-format-html.c (efh_multipart_signed):
+ * em-format.c (emf_multipart_signed): treat
+ application/pkcs7-signature as application/x-pkcs-signature.
+ Stupud non-rfc-compliant mailers from apple. Bug #51750.
+
* em-folder-selection.c (em_select_folder): rewritten to get rid
of hte old crap that should've been gotten rid of before. Bug
#51602.
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 47c0041ff3..242595eb5d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -883,7 +883,8 @@ efhd_multipart_signed (EMFormat *emf, CamelStream *stream, CamelMimePart *part,
/* FIXME: Should be done via a plugin interface */
/* FIXME: duplicated in em-format-html.c */
- if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0)
+ if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0
+ || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0)
cipher = camel_smime_context_new(emf->session);
else if (g_ascii_strcasecmp("application/pgp-signature", mps->protocol) == 0)
cipher = camel_gpg_context_new(emf->session);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f3b9b46c5a..348c5ef653 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1033,7 +1033,8 @@ efh_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
/* FIXME: Should be done via a plugin interface */
/* FIXME: duplicated in em-format-html-display.c */
- if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0)
+ if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0
+ || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0)
cipher = camel_smime_context_new(emf->session);
else if (g_ascii_strcasecmp("application/pgp-signature", mps->protocol) == 0)
cipher = camel_gpg_context_new(emf->session);
diff --git a/mail/em-format.c b/mail/em-format.c
index 2642b5becd..29e55d3cc5 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1187,7 +1187,8 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
CamelCipherContext *cipher = NULL;
/* FIXME: Should be done via a plugin interface */
- if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0)
+ if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0
+ || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0)
cipher = camel_smime_context_new(emf->session);
else if (g_ascii_strcasecmp("application/pgp-signature", mps->protocol) == 0)
cipher = camel_gpg_context_new(emf->session);