From 86fb10614e2267032e42eb09a20c3c4be179b2de Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Sun, 25 Jul 2010 10:29:49 +0000 Subject: [PATCH] Accept x-pkcs7-signature MIME type as signature. 2010-07-24 David Engster * mml-smime.el (mml-smime-epg-verify): Also accept the older x-pkcs7-signature MIME type as signature (RFC 2311, C.1). --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/mml-smime.el | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ce092e36301..e2af8fcdd16 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-07-24 David Engster + + * 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 * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>" diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index a4541ac5dec..827003f8ec7 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -520,10 +520,14 @@ Content-Disposition: attachment; filename=smime.p7m 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)) -- 2.39.2