Merge pull request #487 from mayerwin/patch-1

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs b/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
index 4104dfbd909d5afeb38bc4eadbe7c8b580f2615b..bf4a7e95ae914a51de0e3ffaed4f76bcda0961da 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
@@ -26,6 +26,8 @@
 // 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 !MOONLIGHT
 \r
 using System.Runtime.InteropServices;
 \r
@@ -35,14 +37,16 @@ namespace System.Security.Cryptography {
        // a.   FIPS PUB 197: Advanced Encryption Standard
        //      http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
 \r
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public abstract class Rijndael : SymmetricAlgorithm {\r
 \r
                public static new Rijndael Create () \r
                {\r
+#if FULL_AOT_RUNTIME
+                       return new System.Security.Cryptography.RijndaelManaged ();
+#else
                        return Create ("System.Security.Cryptography.Rijndael");\r
+#endif
                }\r
 \r
                public static new Rijndael Create (string algName) \r
@@ -50,11 +54,7 @@ namespace System.Security.Cryptography {
                        return (Rijndael) CryptoConfig.CreateFromName (algName);\r
                }\r
 
-#if NET_2_0
                protected Rijndael ()
-#else\r
-               public Rijndael ()
-#endif\r
                {\r
                        KeySizeValue = 256;\r
                        BlockSizeValue = 128;\r
@@ -68,3 +68,5 @@ namespace System.Security.Cryptography {
                }\r
        }\r
 }\r
+#endif
+