aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno2014-09-29 20:05:40 +0900
committerDaiki Ueno2014-09-29 20:05:40 +0900
commit8f24b587c87f621f5bc9997589de5d4e3f73b1c3 (patch)
treea6e3bdb564b87f292ef9b2138032d61c8b73cf4c
parent2d7ade06a112d826a6a5d673e1db4e7959ed62a7 (diff)
downloademacs-8f24b587c87f621f5bc9997589de5d4e3f73b1c3.tar.gz
emacs-8f24b587c87f621f5bc9997589de5d4e3f73b1c3.zip
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/ChangeLog5
-rw-r--r--lisp/gnus/mml.el4
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 @@
12014-09-29 Daiki Ueno <ueno@gnu.org>
2
3 * mml.el (mml-parse-1): Error out if unknown mode is specified in
4 <#secure> tag (bug#18513).
5
12014-09-11 Paul Eggert <eggert@cs.ucla.edu> 62014-09-11 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling 8 * 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.")
257 ((string= mode "encrypt") 257 ((string= mode "encrypt")
258 (setq tags (list "encrypt" method))) 258 (setq tags (list "encrypt" method)))
259 ((string= mode "signencrypt") 259 ((string= mode "signencrypt")
260 (setq tags (list "sign" method "encrypt" method)))) 260 (setq tags (list "sign" method "encrypt" method)))
261 (t
262 (error "Unknown secure mode %s" mode)))
261 (eval `(mml-insert-tag ,secure-mode 263 (eval `(mml-insert-tag ,secure-mode
262 ,@tags 264 ,@tags
263 ,(if keyfile "keyfile") 265 ,(if keyfile "keyfile")