Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -31,7 +31,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System.Collections;
using System.IO;
@@ -107,13 +106,11 @@ namespace System.Security.Cryptography.Xml {
return null; // THIS IS DOCUMENTED AS SUCH
}
#if NET_2_0
public override byte[] GetDigestedOutput (HashAlgorithm hash)
{
// no null check, MS throws a NullReferenceException here
return hash.ComputeHash ((Stream) GetOutput ());
}
#endif
public override object GetOutput ()
{
@@ -157,14 +154,9 @@ namespace System.Security.Cryptography.Xml {
if (nl != null) {
s = canonicalizer.Canonicalize (nl);
}
#if NET_2_0
else
throw new ArgumentException ("obj");
#else
// note: there is no default are other types won't throw an exception
#endif
}
}
}
#endif