[Emacs-diffs] /srv/bzr/emacs/trunk r100894: Accept x-pkcs7-signature MIME type as signature.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100894 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-25 10:30:57 +0000
message:
  Accept x-pkcs7-signature MIME type as signature.
  
  2010-07-24  David Engster  <address@hidden>
   * mml-smime.el (mml-smime-epg-verify): Also accept the older
   x-pkcs7-signature MIME type as signature (RFC 2311, C.1).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml-smime.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-07-24 11:53:19 +0000
+++ b/lisp/gnus/ChangeLog       2010-07-25 10:29:49 +0000
@@ -1,3 +1,8 @@
+2010-07-24  David Engster  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>"

=== modified file 'lisp/gnus/mml-smime.el'
--- a/lisp/gnus/mml-smime.el    2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/mml-smime.el    2010-07-25 10:29:49 +0000
@@ -520,10 +520,14 @@
                                           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))