diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2005-04-04 18:39:38 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2005-04-04 18:39:38 +0400 |
commit | b321edc78e2df302fc2d1c80a1bcd69f7a49edb4 (patch) | |
tree | 0518baa94940453ee8c26933d80a796693d5ecb8 /mcs/class/System.Security/Mono.Xml | |
parent | ec20c58277cd5617c01907961efd380579848f20 (diff) |
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
Diffstat (limited to 'mcs/class/System.Security/Mono.Xml')
-rwxr-xr-x | mcs/class/System.Security/Mono.Xml/ChangeLog | 7 | ||||
-rwxr-xr-x | mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs | 7 |
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 
 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 ("	"); else if (ch == '\x0A' && type == XmlNodeType.Attribute) sb.Append ("
"); - else if (ch == '\x0D' && (type == XmlNodeType.Attribute || - IsTextNode (type) && type != XmlNodeType.Whitespace || - type == XmlNodeType.Comment || - type == XmlNodeType.ProcessingInstruction)) - sb.Append ("
"); else if (ch == '\x0D') - continue; + sb.Append ("
"); else sb.Append (ch); } |