# HG changeset patch
# User Katsumi Yamaoka <katsumi@flagship2>
# Date 1280053789 0
# Node ID 45a355dbe7fc2c85ad9d4ead43fc139bed459b60
# Parent  1b2674e70efe4ecb3ac902e34bb5c40f57e91905
Accept x-pkcs7-signature MIME type as signature.

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).

diff -r 1b2674e70efe -r 45a355dbe7fc lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sun Jul 25 10:16:08 2010 +0000
+++ b/lisp/gnus/ChangeLog	Sun Jul 25 10:29:49 2010 +0000
@@ -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>"
diff -r 1b2674e70efe -r 45a355dbe7fc lisp/gnus/mml-smime.el
--- a/lisp/gnus/mml-smime.el	Sun Jul 25 10:16:08 2010 +0000
+++ b/lisp/gnus/mml-smime.el	Sun Jul 25 10:29:49 2010 +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))