Files
mono/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlSignatureStreamReader.cs
T
Atsushi Eno b321edc78e 2005-04-04 Atsushi Enomoto <[email protected]>
* 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 &#xD; 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
2005-04-04 14:39:38 +00:00

132 lines
3.2 KiB
C#

//
// XmlSignatureStreamReader.cs: Wrap TextReader and eliminate \r
//
// Author:
// Atsushi Enomoto ([email protected])
//
// (C) 2005 Novell Inc.
//
//
// 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.
//
//
// Use it to distinguish &#xD; and \r. \r is removed, while &#xD; is not.
//
//
using System;
using System.IO;
using System.Runtime.InteropServices;
namespace System.Security.Cryptography.Xml
{
internal class XmlSignatureStreamReader : TextReader
{
TextReader source;
int cache = int.MinValue;
public XmlSignatureStreamReader (TextReader input)
{
source =input;
}
public override void Close ()
{
source.Close ();
}
public override int Peek ()
{
// If source TextReader does not support Peek(),
// it does not support too. Or it just returns EOF.
if (source.Peek () == -1)
return -1;
if (cache != int.MinValue)
return cache;
cache = source.Read ();
if (cache != '\r')
return cache;
// cache must be '\r' here.
if (source.Peek () != '\n')
return '\r';
// Now Peek() returns '\n', so clear cache.
cache = int.MinValue;
return '\n';
}
public override int Read ()
{
if (cache != int.MinValue) {
int ret = cache;
cache = int.MinValue;
return ret;
}
int i = source.Read ();
if (i != '\r')
return i;
// read one more char (after '\r')
cache = source.Read ();
if (cache != '\n')
return '\r';
cache = int.MinValue;
return '\n';
}
public override int ReadBlock (
[In, Out] char [] buffer, int index, int count)
{
char [] tmp = new char [count];
source.ReadBlock (tmp, 0, count);
int j = index;
for (int i = 0; i < count; j++) {
if (tmp [i] == '\r') {
if (++i < tmp.Length && tmp [i] == '\n')
buffer [j] = tmp [i++];
else
buffer [j] = '\r';
}
else
buffer [j] = tmp [i];
}
while (j < count) {
int d = Read ();
if (d < 0)
break;
buffer [j++] = (char) d;
}
return j;
}
// I have no idea what to do here, but I don't think it
// makes sense.
public override string ReadLine ()
{
return source.ReadLine ();
}
public override string ReadToEnd ()
{
return source.ReadToEnd ().Replace ("\r\n", "\n");
}
}
}