Mercurial > emacs

diff lisp/gnus/mml-smime.el @ 109532:45a355dbe7fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Katsumi Yamaoka <katsumi@flagship2>
date Sun, 25 Jul 2010 10:29:49 +0000
parents 1d1d5d9bd884
children 8d09094063d0
line wrap: on
line diff
--- 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))