diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-09-29 20:05:40 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-09-29 20:05:40 +0900 |
| commit | 8f24b587c87f621f5bc9997589de5d4e3f73b1c3 (patch) | |
| tree | a6e3bdb564b87f292ef9b2138032d61c8b73cf4c | |
| parent | 2d7ade06a112d826a6a5d673e1db4e7959ed62a7 (diff) | |
| download | emacs-8f24b587c87f621f5bc9997589de5d4e3f73b1c3.tar.gz | |
mml: Signal error on invalid <#secure> tag
* mml.el (mml-parse-1): Error out if unknown mode is specified in
<#secure> tag (bug#18513).
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/mml.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 956cc6b70c3..7e6137226b5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2014-09-29 Daiki Ueno <ueno@gnu.org> + + * mml.el (mml-parse-1): Error out if unknown mode is specified in + <#secure> tag (bug#18513). + 2014-09-11 Paul Eggert <eggert@cs.ucla.edu> * gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 726faeed6a0..fccdf521303 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -257,7 +257,9 @@ part. This is for the internal use, you should never modify the value.") ((string= mode "encrypt") (setq tags (list "encrypt" method))) ((string= mode "signencrypt") - (setq tags (list "sign" method "encrypt" method)))) + (setq tags (list "sign" method "encrypt" method))) + (t + (error "Unknown secure mode %s" mode))) (eval `(mml-insert-tag ,secure-mode ,@tags ,(if keyfile "keyfile") |