diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-10-01 11:25:15 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-10-01 11:25:15 +0900 |
| commit | c8145320b2f6d0f07fe3bd1a0c72f39ad1654d4c (patch) | |
| tree | e08ec86806a6358dacef237f08cea3539ed70e9e | |
| parent | 85ee81a08fa5ec3fb0261174c1dabbef433c2e14 (diff) | |
| download | emacs-c8145320b2f6d0f07fe3bd1a0c72f39ad1654d4c.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 993bbbb2475..228cd104783 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-06-26 Glenn Morris <rgm@gnu.org> * mm-util.el (help-function-arglist): Remove outdated declaration. diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 439d7c5dc13..8c2f84ae49d 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -260,7 +260,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") |