From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 1 Oct 2014 02:25:15 +0000 (+0900)
Subject: mml: Signal error on invalid <#secure> tag
X-Git-Tag: emacs-24.3.94~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8145320b2f6d0f07fe3bd1a0c72f39ad1654d4c;p=emacs.git

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 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")