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 956cc6b70c39045383c4f9abd68720676b3d0ef9..7e6137226b5de1e73616f78a4e11496d0f083afc 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-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 726faeed6a066d0bca383a58ab9dbe24929b05e7..fccdf521303f371ed76df2b89095574be33d89b3 100644 (file)
--- 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")