[Emacs-diffs] trunk r117973: mml: Signal error on invalid <#secure> tag

[Daiki Ueno]

------------------------------------------------------------
revno: 117973
revision-id: address@hidden
parent: address@hidden
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-29 20:05:40 +0900
message:
  mml: Signal error on invalid <#secure> tag
  
  * mml.el (mml-parse-1): Error out if unknown mode is specified in
  <#secure> tag (bug#18513).
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/mml.el               mml.el-20091113204419-o5vbwnq5f7feedwu-1977

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-09-11 19:44:25 +0000
+++ b/lisp/gnus/ChangeLog       2014-09-29 11:05:40 +0000
@@ -1,3 +1,8 @@
+2014-09-29  Daiki Ueno  <address@hidden>
+
+       * mml.el (mml-parse-1): Error out if unknown mode is specified in
+       <#secure> tag (bug#18513).
+
 2014-09-11  Paul Eggert  <address@hidden>
 
        * gnus-cloud.el (gnus-cloud-parse-version-1): Fix misspelling

=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el  2014-03-24 01:56:03 +0000
+++ b/lisp/gnus/mml.el  2014-09-29 11:05:40 +0000
@@ -257,7 +257,9 @@
                ((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")