# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1279691778 -32400
# Node ID 9d999899723d25b85d4a26da65c86be494c90c5f
# Parent  00c18905e17ac182b6535eb305859e37c1327436
Fix multiple-recipient handling of Gnus S/MIME.

* mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>" tag
(Bug#6654).

diff -r 00c18905e17a -r 9d999899723d lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Jul 21 06:40:47 2010 +0200
+++ b/lisp/gnus/ChangeLog	Wed Jul 21 14:56:18 2010 +0900
@@ -1,3 +1,8 @@
+2010-07-21  Daiki Ueno  <ueno@unixuser.org>
+
+	* mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>"
+	tag (Bug#6654).
+
 2010-07-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-summary-bookmark-make-record): Bookmark position in
diff -r 00c18905e17a -r 9d999899723d lisp/gnus/mml.el
--- a/lisp/gnus/mml.el	Wed Jul 21 06:40:47 2010 +0200
+++ b/lisp/gnus/mml.el	Wed Jul 21 14:56:18 2010 +0900
@@ -228,7 +228,10 @@
 	(let* (secure-mode
 	       (taginfo (mml-read-tag))
 	       (keyfile (cdr (assq 'keyfile taginfo)))
-	       (certfile (cdr (assq 'certfile taginfo)))
+	       (certfiles (delq nil (mapcar (lambda (tag)
+					      (if (eq (car-safe tag) 'certfile)
+						  (cdr tag)))
+					    taginfo)))
 	       (recipients (cdr (assq 'recipients taginfo)))
 	       (sender (cdr (assq 'sender taginfo)))
 	       (location (cdr (assq 'tag-location taginfo)))
@@ -254,8 +257,10 @@
 				 ,@tags
 				 ,(if keyfile "keyfile")
 				 ,keyfile
-				 ,(if certfile "certfile")
-				 ,certfile
+				 ,@(apply #'append
+					  (mapcar (lambda (certfile)
+						    (list "certfile" certfile))
+						  certfiles))
 				 ,(if recipients "recipients")
 				 ,recipients
 				 ,(if sender "sender")