Accept x-pkcs7-signature MIME type as signature.

* mml-smime.el (mml-smime-epg-verify): Also accept the older
x-pkcs7-signature MIME type as signature (RFC 2311, C.1).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a72c6b0..d1ae11a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-24  David Engster  <dengste@eml.cc>
+
+       * mml-smime.el (mml-smime-epg-verify): Also accept the older
+       x-pkcs7-signature MIME type as signature (RFC 2311, C.1).
+

 2010-07-21  Daiki Ueno  <ueno@unixuser.org>
 
        * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>"
 2010-07-21  Daiki Ueno  <ueno@unixuser.org>
 
        * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>"

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index a4541ac..827003f 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -520,10 +520,14 @@ Content-Disposition: attachment; filename=smime.p7m
                                           ctl 'protocol)
                                          "application/pkcs7-signature")
                                  t)))
                                           ctl 'protocol)
                                          "application/pkcs7-signature")
                                  t)))

-               (null (setq signature (mm-find-part-by-type
-                                      (cdr handle)
-                                      "application/pkcs7-signature"
-                                      nil t))))
+               (null (setq signature (or (mm-find-part-by-type
+                                          (cdr handle)
+                                          "application/pkcs7-signature"
+                                          nil t)
+                                         (mm-find-part-by-type
+                                          (cdr handle)
+                                          "application/x-pkcs7-signature"
+                                          nil t)))))

        (mm-set-handle-multipart-parameter
         mm-security-handle 'gnus-info "Corrupted")
        (throw 'error handle))
        (mm-set-handle-multipart-parameter
         mm-security-handle 'gnus-info "Corrupted")
        (throw 'error handle))