2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Security / System.Security.Cryptography.Xml / XmlDsigXPathTransform.cs

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
index dd69ef20dc8f8c1882350c73eee0ddc6179501b2..1b7c9b3932384ea6a78dec03b277c8e96a745ca2 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDsigXPathTransform.cs
@@ -11,6 +11,27 @@
 // (C) 2004 Novell (http://www.novell.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.IO;
 using System.Text;
@@ -95,6 +116,13 @@ namespace System.Security.Cryptography.Xml
                        }
 
                        ctx = new XmlDsigXPathContext (doc);
+                       foreach (XmlNode n in xpath) {
+                               XPathNavigator nav = n.CreateNavigator ();
+                               XPathNodeIterator iter = nav.Select ("namespace::*");
+                               while (iter.MoveNext ())
+                                       if (iter.Current.LocalName != "xml")
+                                               ctx.AddNamespace (iter.Current.LocalName, iter.Current.Value);
+                       }
                        return EvaluateMatch (doc, x);
                }
 
@@ -125,7 +153,8 @@ namespace System.Security.Cryptography.Xml
                                al.Add (n);
                        if (n.Attributes != null)
                                for (int i = 0; i < n.Attributes.Count; i++)
-                                       EvaluateMatch (n.Attributes [i], exp, al);
+                                       if (NodeMatches (n.Attributes [i], exp))
+                                               al.Add (n.Attributes [i]);
                        for (int i = 0; i < n.ChildNodes.Count; i++)
                                EvaluateMatch (n.ChildNodes [i], exp, al);
                }
@@ -163,7 +192,9 @@ namespace System.Security.Cryptography.Xml
                        // possible input: Stream, XmlDocument, and XmlNodeList
                        if (obj is Stream) {
                                doc = new XmlDocument ();
+#if ! NET_1_0
                                doc.XmlResolver = GetResolver ();
+#endif
                                doc.Load (obj as Stream);
                        }
                        else if (obj is XmlDocument) {
@@ -171,7 +202,9 @@ namespace System.Security.Cryptography.Xml
                        }
                        else if (obj is XmlNodeList) {
                                doc = new XmlDocument ();
+#if ! NET_1_0
                                doc.XmlResolver = GetResolver ();
+#endif
                                foreach (XmlNode xn in (obj as XmlNodeList))  {
                                        XmlNode importedNode = doc.ImportNode (xn, true);
                                        doc.AppendChild (importedNode);