2005-04-23 Sebastien Pouliot <sebastien@ximian.com>

	* EncryptedXml.cs, SignedXml.cs: Changed X509CertificateEx to
	X509Certificate2 to match beta2.

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

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
index ec3dd6d66843f95961318d3605b2e78fbaa53e3d..535bf8adcd75fcaa95842a4a3de593a39c012b71 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-23  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * EncryptedXml.cs, SignedXml.cs: Changed X509CertificateEx to 
+       X509Certificate2 to match beta2.
+
 2005-04-04  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlSignatureStreamReader.cs : new file. Handles Stream to rip CR off.

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
index db0eb4be23c13901f57718d8691bbeca26ca0cdb..d40a72cf0a1151cb57bb2f00fbc148596d3440a9 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs
@@ -231,7 +231,7 @@ namespace System.Security.Cryptography.Xml {
                }
                
                [MonoTODO]
-               public EncryptedData Encrypt (XmlElement inputElement, X509CertificateEx certificate)
+               public EncryptedData Encrypt (XmlElement inputElement, X509Certificate2 certificate)
                {
                        throw new NotImplementedException ();
                }

diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
index 002af1064135a6e56fb184be960170fcd7817de3..3ce51a5ab8a2681069ab395f0214653efb0c5ddb 100644 (file)
--- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
+++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
@@ -8,9 +8,7 @@
 //
 // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
 // Copyright (C) Tim Coleman, 2004
-// (C) 2004 Novell (http://www.novell.com)
-//
-
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -590,7 +588,7 @@ namespace System.Security.Cryptography.Xml {
 
 #if NET_2_0
                [MonoTODO]
-               public bool CheckSignature (X509CertificateEx certificate, bool verifySignatureOnly)
+               public bool CheckSignature (X509Certificate2 certificate, bool verifySignatureOnly)
                {
                        throw new NotImplementedException ();
                }