diff options
| author | Roy Hashimoto <roy.hashimoto@gmail.com> | 2013-06-10 05:17:51 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2013-06-10 05:17:51 +0000 |
| commit | d058863a12904191b8f6472e80b05bb9adf16345 (patch) | |
| tree | 6fa1531cc3fc7d7beee107e49a9ffebc62b82ec1 /lisp/gnus | |
| parent | 17dd30979f06dc191061b657f8755ebe0f9bde5c (diff) | |
| download | emacs-d058863a12904191b8f6472e80b05bb9adf16345.tar.gz | |
lisp/gnus/mm-view.el (mm-pkcs7-signed-magic, mm-pkcs7-enveloped-magic): Correct PKCS7 regexps to match messages with 0x0a bytes
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/mm-view.el | 20 |
2 files changed, 22 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 35f9f47936d..2c2880ee398 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2013-06-10 Roy Hashimoto <roy.hashimoto@gmail.com> (tiny change) + + * mm-view.el (mm-pkcs7-signed-magic): Allow newline in the regexp and + make it easier to read. + (mm-pkcs7-enveloped-magic): Ditto. + 2013-06-06 Teodor Zlatanov <tzz@lifelogs.com> * gnus-ems.el (gnus-image-type-available-p): Test `display-images-p' diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el index ac6170a3cdf..b1cba27c335 100644 --- a/lisp/gnus/mm-view.el +++ b/lisp/gnus/mm-view.el @@ -660,14 +660,26 @@ If MODE is not set, try to find mode automatically." ;; id-signedData OBJECT IDENTIFIER ::= { iso(1) member-body(2) ;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 2 } (defvar mm-pkcs7-signed-magic - "\x30\x5c\x28\x80\x5c\x7c\x81\x2e\x5c\x7c\x82\x2e\x2e\x5c\x7c\x83\x2e\x2e\ -\x2e\x5c\x29\x06\x09\x5c\x2a\x86\x48\x86\xf7\x0d\x01\x07\x02") + (concat + "0" + "\\(\\(\x80\\)" + "\\|\\(\x81\\(.\\|\n\\)\\{1\\}\\)" + "\\|\\(\x82\\(.\\|\n\\)\\{2\\}\\)" + "\\|\\(\x83\\(.\\|\n\\)\\{3\\}\\)" + "\\)" + "\x06\x09\\*\x86H\x86\xf7\x0d\x01\x07\x02")) ;; id-envelopedData OBJECT IDENTIFIER ::= { iso(1) member-body(2) ;; us(840) rsadsi(113549) pkcs(1) pkcs7(7) 3 } (defvar mm-pkcs7-enveloped-magic - "\x30\x5c\x28\x80\x5c\x7c\x81\x2e\x5c\x7c\x82\x2e\x2e\x5c\x7c\x83\x2e\x2e\ -\x2e\x5c\x29\x06\x09\x5c\x2a\x86\x48\x86\xf7\x0d\x01\x07\x03") + (concat + "0" + "\\(\\(\x80\\)" + "\\|\\(\x81\\(.\\|\n\\)\\{1\\}\\)" + "\\|\\(\x82\\(.\\|\n\\)\\{2\\}\\)" + "\\|\\(\x83\\(.\\|\n\\)\\{3\\}\\)" + "\\)" + "\x06\x09\\*\x86H\x86\xf7\x0d\x01\x07\x03")) (defun mm-view-pkcs7-get-type (handle) (mm-with-unibyte-buffer |