2005-04-04 Atsushi Enomoto <atsushi@ximian.com>

	* System.Security.dll.sources: added XmlSignatureStreamReader.cs.

	* XmlSignatureStreamReader.cs : new file. Handles Stream to rip CR off.
	* XmlDsigXPathTransform.cs,
	  XmlDecryptionTransform.cs,
	  XmlDsigC14NTransform.cs,
	  XmlDsigEnvelopedSignatureTransform.cs,
	  XmlDsigXsltTransform.cs : use XmlSignatureStreamReader for Streams.

	* XmlCanonicalizer.cs : don't rip 
 off here.

	* XmlDsigC14NTransformTest.cs :
	  Reverted last change in LoadInputAsXmlNodeList2(). It is MS bug.
	  It now handles Load() behavioral difference between Stream and
	  XmlDocument as expected.

	* Makefile : Fixed reference to Mono.Security.dll. Added decent-reader
	  option that indicates to use CR ('\r') stripping TextReader.
	* xmldsig.cs : use CR-stripping TextReader (optionally).


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

2 files changed, 7 insertions, 7 deletions

diff --git a/mcs/class/System.Security/Mono.Xml/ChangeLog b/mcs/class/System.Security/Mono.Xml/ChangeLog
index 0033a80410d..ff9741e4d8b 100755
--- a/mcs/class/System.Security/Mono.Xml/ChangeLog
+++ b/mcs/class/System.Security/Mono.Xml/ChangeLog
@@ -1,6 +1,11 @@
+2005-04-04  Atsushi Enomoto <atsushi@ximian.com>
+
+	* XmlCanonicalizer.cs : don't rip &#xD; off here.
+
 2004-05-14  Atsushi Enomoto <atsushi@ximian.com>
 
-	* Reverted xmlns change that seems my misinterpretation.
+	* XmlCanonicalizer.cs :
+	  Reverted xmlns change that seems my misinterpretation.
 
 2004-05-13  Atsushi Enomoto <atsushi@ximian.com>
 
diff --git a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
index 80a9b5a21b7..111bd0491b8 100755
--- a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
+++ b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
@@ -514,13 +514,8 @@ namespace Mono.Xml {
 					sb.Append ("&#x9;");
 				else if (ch == '\x0A' && type == XmlNodeType.Attribute)
 					sb.Append ("&#xA;");
-				else if (ch == '\x0D' && (type == XmlNodeType.Attribute ||
-							  IsTextNode (type) && type != XmlNodeType.Whitespace ||
-							  type == XmlNodeType.Comment ||
-							  type == XmlNodeType.ProcessingInstruction))
-					sb.Append ("&#xD;");
 				else if (ch == '\x0D')
-					continue;
+					sb.Append ("&#xD;");
 				else
 					sb.Append (ch);
 			}