Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / corlib / System.Security.Cryptography / TripleDES.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
index 4c818a3f8a23a8e4791d1f8bc6f4ca3c85b88d70..3fa0800cdffb20ff46bd18a26d3ecfaf5dea2d3e 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
@@ -40,16 +40,10 @@ namespace System.Security.Cryptography {
 //     not free :-(
 //     http://webstore.ansi.org/ansidocstore/product.asp?sku=ANSI+X9%2E52%2D1998
 
-#if NET_2_0
 [ComVisible (true)]
-#endif
 public abstract class TripleDES : SymmetricAlgorithm {
 
-#if NET_2_0
        protected TripleDES ()
-#else
-       public TripleDES ()
-#endif
        {
                // from SymmetricAlgorithm
                KeySizeValue = 192;
@@ -93,10 +87,8 @@ public abstract class TripleDES : SymmetricAlgorithm {
        //      if ( b == c ) then TripleDES == DES(a) (hence weak key)
        public static bool IsWeakKey (byte[] rgbKey)
        {
-#if NET_2_0
                if (rgbKey == null)
                        throw new CryptographicException (Locale.GetText ("Null Key"));
-#endif
                // 128 bits (16 bytes) is 3 DES with 2 keys
                if (rgbKey.Length == 16) {
                        // weak if first half == second half
@@ -129,7 +121,11 @@ public abstract class TripleDES : SymmetricAlgorithm {
 
        public static new TripleDES Create ()
        {
+#if FULL_AOT_RUNTIME
+               return new System.Security.Cryptography.TripleDESCryptoServiceProvider ();
+#else
                return Create ("System.Security.Cryptography.TripleDES");
+#endif
        }
 
        public static new TripleDES Create (string str)
@@ -139,3 +135,4 @@ public abstract class TripleDES : SymmetricAlgorithm {
 }
 
 }
+