2007-01-17 Atsushi Enomoto <atsushi@ximian.com>

	* XmlCanonicalizer.cs : don't output default namespace when the node's
	  namespace is not empty. Check "visibly utilized" namespace nodes in
	  exc-c14n. Also, in exc-c14n, rendered namespaces are not written.
	  Added InclusiveNamespaces PrefixList field (not in use yet).

	* XmlDsigExcC14NTransform.cs :
	  re-imported from XmlDsigC14NTransform.cs.

	* System.Security_test.dll.sources : added
	  XmlDsigExcC14NTransformTest.cs.

	* XmlDsigExcC14NTransformTest.cs : new tests, mostly copied from
	  non-exc test.

	* xmldsig.cs : exc-c14n tests could be run under 2.0 profile (and
	  they are not working correctly yet).
	* Makefile : Added net_2_0 profile support.


svn path=/trunk/mcs/; revision=71220

5 files changed, 506 insertions, 3 deletions

diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ChangeLog
index ac635a97a96..155ab782ce8 100644
--- a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ChangeLog
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* XmlDsigExcC14NTransformTest.cs : new tests, mostly copied from
+	  non-exc test.
+
 2007-01-12  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* SignedXmlTest.cs : added DataReferenceToNonDataObject().
diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
new file mode 100644
index 00000000000..ac00aaebe28
--- /dev/null
+++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Xml/XmlDsigExcC14NTransformTest.cs
@@ -0,0 +1,485 @@
+//
+// XmlDsigExcC14NTransformTest.cs - NUnit Test Cases for XmlDsigExcC14NTransform
+//
+// Author:
+//  original:
+//	Sebastien Pouliot <sebastien@ximian.com>
+//	Aleksey Sanin (aleksey@aleksey.com)
+//  this file:
+//	Atsushi Enomoto <atsushi@ximian.com>
+//
+// (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// (C) 2003 Aleksey Sanin (aleksey@aleksey.com)
+// (C) 2004 Novell (http://www.novell.com)
+//
+
+//
+// WARNING!!
+//	This file is simply replaced C14N->ExcC14N, and then replaced expected
+//	output XML. So, they are *not* from c14n specification.
+//
+
+#if NET_2_0
+
+using System;
+using System.IO;
+using System.Security.Cryptography.Xml;
+using System.Text;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Security.Cryptography.Xml {
+
+	// Note: GetInnerXml is protected in XmlDsigExcC14NTransform making it
+	// difficult to test properly. This class "open it up" :-)
+	public class UnprotectedXmlDsigExcC14NTransform : XmlDsigExcC14NTransform {
+
+		public XmlNodeList UnprotectedGetInnerXml () {
+			return base.GetInnerXml ();
+		}
+	}
+
+	[TestFixture]
+	public class XmlDsigExcC14NTransformTest : Assertion {
+
+		protected UnprotectedXmlDsigExcC14NTransform transform;
+
+		[SetUp]
+		protected void SetUp () 
+		{
+			transform = new UnprotectedXmlDsigExcC14NTransform ();
+		}
+
+		[TearDown]
+		protected void CleanUp () 
+		{
+			try {
+				if (File.Exists ("doc.dtd"))
+					File.Delete ("doc.dtd");
+				if (File.Exists ("world.txt"))
+					File.Delete ("world.txt");
+			}
+			catch {}
+		}
+
+		[Test]
+		public void Properties () 
+		{
+			AssertEquals ("Algorithm", "http://www.w3.org/2001/10/xml-exc-c14n#", transform.Algorithm);
+
+			Type[] input = transform.InputTypes;
+			Assert ("Input #", (input.Length == 3));
+			// check presence of every supported input types
+			bool istream = false;
+			bool ixmldoc = false;
+			bool ixmlnl = false;
+			foreach (Type t in input) {
+				if (t.ToString () == "System.IO.Stream")
+					istream = true;
+				if (t.ToString () == "System.Xml.XmlDocument")
+					ixmldoc = true;
+				if (t.ToString () == "System.Xml.XmlNodeList")
+					ixmlnl = true;
+			}
+			Assert ("Input Stream", istream);
+			Assert ("Input XmlDocument", ixmldoc);
+			Assert ("Input XmlNodeList", ixmlnl);
+
+			Type[] output = transform.OutputTypes;
+			Assert ("Output #", (output.Length == 1));
+			// check presence of every supported output types
+			bool ostream = false;
+			foreach (Type t in output) {
+				if (t.ToString () == "System.IO.Stream")
+					ostream = true;
+			}
+			Assert ("Output Stream", ostream);
+		}
+
+		[Test]
+		public void GetInnerXml () 
+		{
+			XmlNodeList xnl = transform.UnprotectedGetInnerXml ();
+			AssertNull ("Default InnerXml", xnl);
+		}
+
+		private string Stream2String (Stream s) 
+		{
+			StringBuilder sb = new StringBuilder ();
+			int b = s.ReadByte ();
+			while (b != -1) {
+				sb.Append (Convert.ToChar (b));
+				b = s.ReadByte ();
+			}
+			return sb.ToString ();
+		}
+
+		static string xml = "<Test  attrib='at ' xmlns=\"http://www.go-mono.com/\" > \r\n &#xD; <Toto/> text &amp; </Test   >";
+		// BAD for XmlDocument input (framework 1.0 result)
+		static string c14xml1 = "<Test xmlns=\"http://www.go-mono.com/\" attrib=\"at \"> \r\n \r <Toto></Toto> text &amp; </Test>";
+		// GOOD for Stream input
+		static string c14xml2 = "<Test xmlns=\"http://www.go-mono.com/\" attrib=\"at \"> \n &#xD; <Toto></Toto> text &amp; </Test>";
+		// GOOD for XmlDocument input. The difference is because once
+		// xml string is loaded to XmlDocument, there is no difference
+		// between \r and &#xD;, so every \r must be handled as &#xD;.
+		static string c14xml3 = "<Test xmlns=\"http://www.go-mono.com/\" attrib=\"at \"> &#xD;\n &#xD; <Toto></Toto> text &amp; </Test>";
+
+		private XmlDocument GetDoc () 
+		{
+			XmlDocument doc = new XmlDocument ();
+			doc.PreserveWhitespace = true;
+			doc.LoadXml (xml);
+			return doc;
+		}
+
+		[Test]
+		public void LoadInputAsXmlDocument () 
+		{
+			XmlDocument doc = GetDoc ();
+			transform.LoadInput (doc);
+			Stream s = (Stream) transform.GetOutput ();
+			string output = Stream2String (s);
+#if NET_1_1
+			AssertEquals("XmlDocument", c14xml3, output);
+#else
+			// .NET 1.0 keeps the \r\n (0x0D, 0x0A) - bug
+			AssertEquals("XmlDocument", c14xml1, output);
+#endif
+		}
+
+		[Test]
+#if NET_2_0
+		[Category ("NotDotNet")]

+		// see LoadInputAsXmlNodeList2 description
+#endif
+		public void LoadInputAsXmlNodeList () 
+		{
+			XmlDocument doc = GetDoc ();
+			// Argument list just contains element Test.
+			transform.LoadInput (doc.ChildNodes);
+			Stream s = (Stream) transform.GetOutput ();
+			string output = Stream2String (s);
+			AssertEquals ("XmlChildNodes", "<Test></Test>", output);
+		}
+
+		[Test]
+		[Category ("NotDotNet")]
+		// MS has a bug that those namespace declaration nodes in
+		// the node-set are written to output. Related spec section is:
+		// http://www.w3.org/TR/2001/REC-xml-c14n-20010315#ProcessingModel
+		public void LoadInputAsXmlNodeList2 () 
+		{
+			XmlDocument doc = GetDoc ();
+			transform.LoadInput (doc.SelectNodes ("//*"));
+			Stream s = (Stream) transform.GetOutput ();
+			string output = Stream2String (s);
+			string expected = @"<Test><Toto></Toto></Test>";
+			AssertEquals ("XmlChildNodes", expected, output);
+		}
+
+		[Test]
+		public void LoadInputAsStream () 
+		{
+			MemoryStream ms = new MemoryStream ();
+			byte[] x = Encoding.ASCII.GetBytes (xml);
+			ms.Write (x, 0, x.Length);
+			ms.Position = 0;
+			transform.LoadInput (ms);
+			Stream s = (Stream) transform.GetOutput ();
+			string output = Stream2String (s);
+			AssertEquals ("MemoryStream", c14xml2, output);
+		}
+
+		[Test]
+		[Ignore ("LAMESPEC: input MUST be one of InputType - but no exception is thrown (not documented)")]
+		public void LoadInputWithUnsupportedType () 
+		{
+			byte[] bad = { 0xBA, 0xD };
+			transform.LoadInput (bad);
+		}
+
+		[Test]
+		[ExpectedException (typeof (ArgumentException))]
+		public void UnsupportedOutput () 
+		{
+			XmlDocument doc = new XmlDocument();
+			object o = transform.GetOutput (doc.GetType ());
+		}
+
+	        [Test]
+	        public void ExcC14NSpecExample1 ()
+	        {
+			using (StreamWriter sw = new StreamWriter ("doc.dtd", false, Encoding.ASCII)) {
+				sw.Write ("<!-- presence, not content, required -->");
+				sw.Close ();
+			}
+			string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample1Input);
+			AssertEquals ("Example 1 from c14n spec - PIs, Comments, and Outside of Document Element (without comments)", 
+				        ExcC14NSpecExample1Output, res);
+	        }
+
+	        [Test]
+	        public void ExcC14NSpecExample2 ()
+	        {
+			string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample2Input);
+			AssertEquals ("Example 2 from c14n spec - Whitespace in Document Content (without comments)", 
+					ExcC14NSpecExample2Output, res);
+		}
+
+	        [Test]
+	        public void ExcC14NSpecExample3 ()
+	        {
+	    		string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample3Input);
+	    		AssertEquals ("Example 3 from c14n spec - Start and End Tags (without comments)", 
+	    			        ExcC14NSpecExample3Output, res);
+	        }
+	    
+	        [Test]
+//		[Ignore ("This test should be fine, but it does not pass under MS.NET")]
+	        public void ExcC14NSpecExample4 ()
+	        {
+	    		string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample4Input);
+	    		AssertEquals ("Example 4 from c14n spec - Character Modifications and Character References (without comments)", 
+	    			        ExcC14NSpecExample4Output, res);
+	        }
+	    
+	        [Test]
+	        public void ExcC14NSpecExample5 ()
+	        {
+			using (StreamWriter sw = new StreamWriter ("world.txt", false, Encoding.ASCII)) {
+				sw.Write ("world");
+				sw.Close ();
+			}
+	    	    	string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample5Input);
+	    	    	AssertEquals ("Example 5 from c14n spec - Entity References (without comments)", 
+	    				ExcC14NSpecExample5Output, res);
+	        }
+    
+		[Test]
+	        public void ExcC14NSpecExample6 ()
+	        {
+	    	    	string res = ExecuteXmlDSigExcC14NTransform (ExcC14NSpecExample6Input);
+	    	    	AssertEquals ("Example 6 from c14n spec - UTF-8 Encoding (without comments)", 
+	    				ExcC14NSpecExample6Output, res);
+	        }
+
+		private string ExecuteXmlDSigExcC14NTransform (string InputXml)
+		{
+			XmlDocument doc = new XmlDocument ();
+			doc.PreserveWhitespace = true;
+			doc.LoadXml (InputXml);
+		
+			// Testing default attribute support with
+			// vreader.ValidationType = ValidationType.None.
+			//
+			UTF8Encoding utf8 = new UTF8Encoding ();
+			byte[] data = utf8.GetBytes (InputXml.ToString ());
+			Stream stream = new MemoryStream (data);
+			XmlTextReader reader = new XmlTextReader (stream);
+			XmlValidatingReader vreader = new XmlValidatingReader (reader);
+			vreader.ValidationType = ValidationType.None;
+			vreader.EntityHandling = EntityHandling.ExpandCharEntities;
+			doc.Load (vreader);
+
+			transform.LoadInput (doc);
+			return Stream2String ((Stream)transform.GetOutput ());
+		}
+
+	        //
+	        // Example 1 from ExcC14N spec - PIs, Comments, and Outside of Document Element: 
+	        // http://www.w3.org/TR/xml-c14n#Example-OutsideDoc
+	        // 
+	        // Aleksey: 
+	        // removed reference to an empty external DTD
+	        //
+	        static string ExcC14NSpecExample1Input =  
+	    	        "<?xml version=\"1.0\"?>\n" +
+	    	        "\n" +
+	    	        "<?xml-stylesheet   href=\"doc.xsl\"\n" +
+	    	        "   type=\"text/xsl\"   ?>\n" +
+	    	        "\n" +
+	    	        // "<!DOCTYPE doc SYSTEM \"doc.dtd\">\n" +
+	    	        "\n" +
+	    	        "<doc>Hello, world!<!-- Comment 1 --></doc>\n" +
+	    	        "\n" +
+	    	        "<?pi-without-data     ?>\n\n" +
+	    	        "<!-- Comment 2 -->\n\n" +
+	    	        "<!-- Comment 3 -->\n";
+	        static string ExcC14NSpecExample1Output =   
+	    	        "<?xml-stylesheet href=\"doc.xsl\"\n" +
+	    	        "   type=\"text/xsl\"   ?>\n" +
+	    	        "<doc>Hello, world!</doc>\n" +
+	    	        "<?pi-without-data?>";
+	        
+	        //
+	        // Example 2 from ExcC14N spec - Whitespace in Document Content: 
+	        // http://www.w3.org/TR/xml-c14n#Example-WhitespaceInContent
+	        // 
+	        static string ExcC14NSpecExample2Input =  
+	    	        "<doc>\n" +
+	    	        "  <clean>   </clean>\n" +
+	    	        "   <dirty>   A   B   </dirty>\n" +
+	    	        "   <mixed>\n" +
+	    	        "      A\n" +
+	    	        "      <clean>   </clean>\n" +
+	    	        "      B\n" +
+	    	        "      <dirty>   A   B   </dirty>\n" +
+	    	        "      C\n" +
+	    	        "   </mixed>\n" +
+	    	        "</doc>\n";
+	        static string ExcC14NSpecExample2Output =   
+	    	        "<doc>\n" +
+	    	        "  <clean>   </clean>\n" +
+	    	        "   <dirty>   A   B   </dirty>\n" +
+	    	        "   <mixed>\n" +
+	    	        "      A\n" +
+	    	        "      <clean>   </clean>\n" +
+	    	        "      B\n" +
+	    	        "      <dirty>   A   B   </dirty>\n" +
+	    	        "      C\n" +
+	    	        "   </mixed>\n" +
+	    	        "</doc>";
+	    
+	        //
+	        // Example 3 from ExcC14N spec - Start and End Tags: 
+	        // http://www.w3.org/TR/xml-c14n#Example-SETags
+	        //
+	        static string ExcC14NSpecExample3Input =  
+	    	        "<!DOCTYPE doc [<!ATTLIST e9 attr CDATA \"default\">]>\n" +
+	    	        "<doc>\n" +
+	    	        "   <e1   />\n" +
+	    	        "   <e2   ></e2>\n" +
+	    	        "   <e3    name = \"elem3\"   id=\"elem3\"    />\n" +
+	    	        "   <e4    name=\"elem4\"   id=\"elem4\"    ></e4>\n" +
+	    	        "   <e5 a:attr=\"out\" b:attr=\"sorted\" attr2=\"all\" attr=\"I\'m\"\n" +
+	    	        "       xmlns:b=\"http://www.ietf.org\" \n" +
+	    	        "       xmlns:a=\"http://www.w3.org\"\n" +
+	    	        "       xmlns=\"http://www.uvic.ca\"/>\n" +
+	    	        "   <e6 xmlns=\"\" xmlns:a=\"http://www.w3.org\">\n" +
+	    	        "       <e7 xmlns=\"http://www.ietf.org\">\n" +
+	    	        "           <e8 xmlns=\"\" xmlns:a=\"http://www.w3.org\">\n" +
+	    	        "               <e9 xmlns=\"\" xmlns:a=\"http://www.ietf.org\"/>\n" +
+	    	        "           </e8>\n" +
+	    	        "       </e7>\n" +
+	    	        "   </e6>\n" +
+	    	        "</doc>\n";
+	        static string ExcC14NSpecExample3Output =   
+	    	        "<doc>\n" +
+	    	        "   <e1></e1>\n" +
+	    	        "   <e2></e2>\n" +
+	    	        "   <e3 id=\"elem3\" name=\"elem3\"></e3>\n" +
+	    	        "   <e4 id=\"elem4\" name=\"elem4\"></e4>\n" +
+	    	        "   <e5 xmlns=\"http://www.uvic.ca\" xmlns:a=\"http://www.w3.org\" xmlns:b=\"http://www.ietf.org\" attr=\"I\'m\" attr2=\"all\" b:attr=\"sorted\" a:attr=\"out\"></e5>\n" +
+    	    	        "   <e6>\n" +
+	    	        "       <e7 xmlns=\"http://www.ietf.org\">\n" +
+	    	        "           <e8 xmlns=\"\">\n" +
+	    	        "               <e9 attr=\"default\"></e9>\n" +
+//	    	        "               <e9 xmlns:a=\"http://www.ietf.org\"></e9>\n" +
+	    	        "           </e8>\n" +
+	    	        "       </e7>\n" +
+	    	        "   </e6>\n" +
+	    	        "</doc>";
+	    
+	    
+	        //
+	        // Example 4 from ExcC14N spec - Character Modifications and Character References: 
+	        // http://www.w3.org/TR/xml-c14n#Example-Chars
+	        //
+	        // Aleksey: 
+	        // This test does not include "normId" element
+	        // because it has an invalid ID attribute "id" which
+	        // should be normalized by XML parser. Currently Mono
+	        // does not support this (see comment after this example
+	        // in the spec).
+	        static string ExcC14NSpecExample4Input =  
+	    	        "<!DOCTYPE doc [<!ATTLIST normId id ID #IMPLIED>]>\n" +
+	    	        "<doc>\n" +
+	    	        "   <text>First line&#x0d;&#10;Second line</text>\n" +
+	    	        "   <value>&#x32;</value>\n" +
+	    	        "   <compute><![CDATA[value>\"0\" && value<\"10\" ?\"valid\":\"error\"]]></compute>\n" +
+	    	        "   <compute expr=\'value>\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"\'>valid</compute>\n" +
+	    	        "   <norm attr=\' &apos;   &#x20;&#13;&#xa;&#9;   &apos; \'/>\n" +
+	    	        // "   <normId id=\' &apos;   &#x20;&#13;&#xa;&#9;   &apos; \'/>\n" +
+	    	        "</doc>\n";
+	        static string ExcC14NSpecExample4Output =   
+	    	        "<doc>\n" +
+	    	        "   <text>First line&#xD;\n" +
+	    	        "Second line</text>\n" +
+	    	        "   <value>2</value>\n" +
+	    	        "   <compute>value&gt;\"0\" &amp;&amp; value&lt;\"10\" ?\"valid\":\"error\"</compute>\n" +
+	    	        "   <compute expr=\"value>&quot;0&quot; &amp;&amp; value&lt;&quot;10&quot; ?&quot;valid&quot;:&quot;error&quot;\">valid</compute>\n" +
+	    	        "   <norm attr=\" \'    &#xD;&#xA;&#x9;   \' \"></norm>\n" +
+	    	        // "   <normId id=\"\' &#xD;&#xA;&#x9; \'\"></normId>\n" +
+	    	        "</doc>";
+	    
+	        //
+	        // Example 5 from ExcC14N spec - Entity References: 
+	        // http://www.w3.org/TR/xml-c14n#Example-Entities
+	        //
+	        static string ExcC14NSpecExample5Input =  
+	    	        "<!DOCTYPE doc [\n" +
+	    	        "<!ATTLIST doc attrExtEnt ENTITY #IMPLIED>\n" +
+	    	        "<!ENTITY ent1 \"Hello\">\n" +
+	    	        "<!ENTITY ent2 SYSTEM \"world.txt\">\n" +
+	    	        "<!ENTITY entExt SYSTEM \"earth.gif\" NDATA gif>\n" +
+	    	        "<!NOTATION gif SYSTEM \"viewgif.exe\">\n" +
+	    	        "]>\n" +
+	    	        "<doc attrExtEnt=\"entExt\">\n" +
+	    	        "   &ent1;, &ent2;!\n" +
+	    	        "</doc>\n" +
+	    	        "\n" +
+	    	        "<!-- Let world.txt contain \"world\" (excluding the quotes) -->\n";
+	        static string ExcC14NSpecExample5Output =  
+	    	        "<doc attrExtEnt=\"entExt\">\n" +
+	    	        "   Hello, world!\n" +
+	    	        "</doc>";	    
+    
+    	        //
+	        // Example 6 from ExcC14N spec - UTF-8 Encoding: 
+	        // http://www.w3.org/TR/xml-c14n#Example-UTF8
+	        // 
+	        static string ExcC14NSpecExample6Input =  
+    	    	        "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" +
+    	    	        "<doc>&#169;</doc>\n";
+	        static string ExcC14NSpecExample6Output =  
+	    	        "<doc>\xC2\xA9</doc>";
+	    
+
+	        //
+	        // Example 7 from ExcC14N spec - Document Subsets: 
+	        // http://www.w3.org/TR/xml-c14n#Example-DocSubsets
+	        // 
+		// Aleksey:
+		// Well, XPath support in Mono is far from complete....
+		// I was not able to simplify the xpath expression from this test
+		// so it runs on Mono and still makes sense for testing this feature.
+		// Thus this test is not included in the suite now.
+	        static string ExcC14NSpecExample7Input =  
+	    	        "<!DOCTYPE doc [\n" +
+	    	        "<!ATTLIST e2 xml:space (default|preserve) \'preserve\'>\n" +
+	    	        "<!ATTLIST e3 id ID #IMPLIED>\n" +
+	    	        "]>\n" +
+	    	        "<doc xmlns=\"http://www.ietf.org\" xmlns:w3c=\"http://www.w3.org\">\n" +
+	    	        "   <e1>\n" +
+	    	        "      <e2 xmlns=\"\">\n" +
+	    	        "         <e3 id=\"E3\"/>\n" +
+	    	        "      </e2>\n" +
+	    	        "   </e1>\n" +
+	    	        "</doc>\n";
+
+	        static string ExcC14NSpecExample7Xpath =  
+    	    	        "(//.|//@*|//namespace::*)\n" +
+	    	        "[\n" +
+	    		"self::ietf:e1\n" +
+	    		"    or\n" +
+	    	        "(parent::ietf:e1 and not(self::text() or self::e2))\n" +
+	    	        "    or\n" +
+	    	        "count(id(\"E3\")|ancestor-or-self::node()) = count(ancestor-or-self::node())\n" +
+	    	        "]";
+	        static string ExcC14NSpecExample7Output =  
+	    	        "<e1 xmlns=\"http://www.ietf.org\" xmlns:w3c=\"http://www.w3.org\"><e3 xmlns=\"\" id=\"E3\" xml:space=\"preserve\"></e3></e1>";
+	}    
+}
+
+#endif
diff --git a/mcs/class/System.Security/Test/standalone_tests/ChangeLog b/mcs/class/System.Security/Test/standalone_tests/ChangeLog
index e7f47423b00..f6c070dcb23 100644
--- a/mcs/class/System.Security/Test/standalone_tests/ChangeLog
+++ b/mcs/class/System.Security/Test/standalone_tests/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* xmldsig.cs : exc-c14n tests could be run under 2.0 profile (and
+	  they are not working correctly yet).
+	* Makefile : Added net_2_0 profile support.
+
 2007-01-12  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* xmldsig.cs : signature-big.xml also depends on the input document.
diff --git a/mcs/class/System.Security/Test/standalone_tests/Makefile b/mcs/class/System.Security/Test/standalone_tests/Makefile
index 8e5958ac081..08719c4ef15 100644
--- a/mcs/class/System.Security/Test/standalone_tests/Makefile
+++ b/mcs/class/System.Security/Test/standalone_tests/Makefile
@@ -1,9 +1,14 @@
-RUNTIME = mono --debug 
-CSCOMPILE = mcs --debug
 PROFILE = default
+RUNTIME = MONO_PATH=../../../lib/$(PROFILE) mono --debug 
 #XMLDSIG_EXE_OPTIONS =
 XMLDSIG_EXE_OPTIONS = --decent-reader
 
+ifeq ($(PROFILE), net_2_0)
+CSCOMPILE = gmcs --debug -d:NET_2_0
+else
+CSCOMPILE = mcs --debug
+endif
+
 run-test: c14n.exe xmldsig.exe merlin-xmldsig-twenty-three
 	$(RUNTIME) $(RUNTIME_FLAGS) c14n.exe merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml SignedInfo | cmp merlin-xmldsig-twenty-three/signature-enveloped-dsa-c14n-1.txt
 	$(RUNTIME) $(RUNTIME_FLAGS) c14n.exe merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml SignedInfo | cmp merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa-c14n-0.txt
@@ -29,7 +34,7 @@ ms-test: c14n.exe xmldsig.exe merlin-xmldsig-twenty-three
 	rm Mono.Security.dll
 
 clean:
-	rm *.exe
+	rm -f *.exe *.exe.mdb
 
 c14n.exe : c14n.cs
 	$(CSCOMPILE) c14n.cs -r:System.Security.dll
diff --git a/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs b/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs
index 4c96f2a08d8..ca996539d33 100644
--- a/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs
+++ b/mcs/class/System.Security/Test/standalone_tests/xmldsig.cs
@@ -258,11 +258,13 @@ DumpSignedXml (s);
 		// some documents references other documents in the directory
 		Directory.SetCurrentDirectory ("phaos-xmldsig-three");
 		foreach (FileInfo fi in new DirectoryInfo (".").GetFiles ("signature-*.xml")) {
+#if !NET_2_0
 			if ((fi.Name.IndexOf ("exclusive") >= 0) && (!exc14n)) {
 				Console.WriteLine ("NOT RUN: " + fi.Name + " : System.Security.dll cannot validate exclusive-c14n.");
 				skip++;
 				continue;
 			}
+#endif
 			if ((fi.Name.IndexOf ("md5") >= 0) && (!hmacmd5)) {
 				Console.WriteLine ("NOT RUN: " + fi.Name + " : System.Security.dll doesn't support HMAC-MD5.");
 				skip++;