Mercurial > emacs
changeset 109532:45a355dbe7fc
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 | 1b2674e70efe |
| children | bbcf76ef0f72 |
| files | lisp/gnus/ChangeLog lisp/gnus/mml-smime.el |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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>"
--- 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))