mml: Signal error on invalid <#secure> tag

* mml.el (mml-parse-1): Error out if unknown mode is specified in
<#secure> tag (bug#18513).

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 993bbbb2475a8227e61244fced3b096fccaa5623..228cd104783878c4326d982fc6df5e26b7bfcba7 100644 (file)
--- 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 439d7c5dc1314499d9410ce81c7df92a7ebbb9ea..8c2f84ae49d69a47ca650d4bdf646f6bf194f7d8 100644 (file)
--- 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")