2004-08-08 Sebastien Pouliot <sebastien@ximian.com>

	* CspProviderFlags.cs: Fixed new enums values.
	* DSA.cs: Fixed #if for constructor visibility.
	* CryptoAPITransform.cs: Removed constructor for NET_2_0 profile.

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
index e523b5e5181482623b45facf455630b5451e0c83..46aa0ba285c3cbcbdf51d36c929fd1680ba77285 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-08  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * CspProviderFlags.cs: Fixed new enums values.
+       * DSA.cs: Fixed #if for constructor visibility.
+       * CryptoAPITransform.cs: Removed constructor for NET_2_0 profile.
+
 2004-07-07  Sebastien Pouliot  <sebastien@ximian.com>
 
        * DES.cs: Fixed FeedbackSizeValue to 8.

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs
index 7f8b161b8cfe242f3b6360210aafeaf3c2526d14..c81e7353c9bd57d4ed0a4b881f23a431f1c88599 100755 (executable)
--- a/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs
@@ -43,10 +43,12 @@ namespace System.Security.Cryptography {
                        m_disposed = false;
                }
 
+#if ! NET_2_0
                ~CryptoAPITransform () 
                {
                        Dispose (false);
                }
+#endif
 
                public bool CanReuseTransform {
                        get { return true; }

diff --git a/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs b/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs
index 66aa22b5eab35c7364ecb52a2dd0f8f0a22aaf3c..f5545879a127745d214a097e7b7df41a053897a6 100755 (executable)
--- a/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs
@@ -37,11 +37,11 @@ namespace System.Security.Cryptography {
 #if NET_2_0
                ,
                NoFlags = 0,
-               NoPrompt = 4,
-               UseArchivableKey = 8,
-               UseExistingKey = 16,
-               UseNonExportableKey = 32,
-               UseUserProtectedKey = 64
+               NoPrompt = 64,
+               UseArchivableKey = 16,
+               UseExistingKey = 8,
+               UseNonExportableKey = 4,
+               UseUserProtectedKey = 32
 #endif
        }
 }

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSA.cs b/mcs/class/corlib/System.Security.Cryptography/DSA.cs
index 3cfbaa6292688841146e4620358e3580bef2fd5a..a18506a9b5248972cdb91563eb21f86bc9101496 100755 (executable)
--- a/mcs/class/corlib/System.Security.Cryptography/DSA.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/DSA.cs
@@ -43,14 +43,14 @@ namespace System.Security.Cryptography {
 
        public abstract class DSA : AsymmetricAlgorithm {
 
-#if (NET_1_0 || NET_1_1)
+#if NET_2_0
+               // Constructor visibility fixed in Fx 2.0
+               protected DSA ()
+#else
                // LAMESPEC: It says to derive new DSA implemenation from DSA class.
                // Well it's aint gonna be easy this way.
                // RSA constructor is public
                internal DSA ()
-#else
-               // Constructor visibility fixed in Fx 2.0
-               protected DSA ()
 #endif
                {
                }