Add $smime_pkcs7_default_smime_type config option.

This works around Outlook sending application/pkcs7-mime ".p7m" parts
without a smime-type parameter.

Mutt previously hardcoded an assumption that these were SignedData to
work around an old Outlook book.  However Outlook now appears to also
send EnvelopedData in this form.

1 files changed, 8 insertions, 3 deletions

diff --git a/crypt.c b/crypt.c
index a9f7089d..245a7d2a 100644
--- a/crypt.c
+++ b/crypt.c
@@ -610,9 +610,14 @@ int mutt_is_application_smime (BODY *m)
     {
       len++;
       if (!ascii_strcasecmp ((t+len), "p7m"))
-        /* Not sure if this is the correct thing to do, but
-           it's required for compatibility with Outlook */
-        return (SMIMESIGN|SMIMEOPAQUE);
+      {
+        if (!ascii_strcasecmp (SmimePkcs7DefaultSmimeType, "signed"))
+          return (SMIMESIGN|SMIMEOPAQUE);
+	else if (!ascii_strcasecmp (SmimePkcs7DefaultSmimeType, "enveloped"))
+	  return SMIMEENCRYPT;
+        else
+          return 0;
+      }
       else if (!ascii_strcasecmp ((t+len), "p7s"))
 	return (SMIMESIGN|SMIMEOPAQUE);
     }