Merge pull request #498 from Unroll-Me/master

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/RSA.cs b/mcs/class/corlib/System.Security.Cryptography/RSA.cs
index 4cf32e580abb25853616f3e898144c0f645a6a28..1a575931845239bfd6082d76cbeb07ac6556b2bf 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RSA.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RSA.cs
@@ -7,7 +7,7 @@
 //
 // (C) 2002
 // Portions (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2006,2008 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
@@ -37,14 +37,16 @@ using Mono.Xml;
 
 namespace System.Security.Cryptography {
 
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public abstract class RSA : AsymmetricAlgorithm {
 
                public static new RSA Create () 
                {
+#if FULL_AOT_RUNTIME
+                       return new System.Security.Cryptography.RSACryptoServiceProvider ();
+#else
                        return Create ("System.Security.Cryptography.RSA");
+#endif
                }
 
                public static new RSA Create (string algName)
@@ -52,11 +54,7 @@ namespace System.Security.Cryptography {
                        return (RSA) CryptoConfig.CreateFromName (algName);
                }
 
-#if NET_2_0
                protected RSA ()
-#else
-               public RSA ()
-#endif
                {
                }
 
@@ -64,7 +62,7 @@ namespace System.Security.Cryptography {
 
                public abstract byte[] DecryptValue (byte[] rgb);
 
-               public abstract RSAParameters ExportParameters (bool include);
+               public abstract RSAParameters ExportParameters (bool includePrivateParameters);
 
                public abstract void ImportParameters (RSAParameters parameters);
 
@@ -84,14 +82,6 @@ namespace System.Security.Cryptography {
                                Array.Clear (parameters.D, 0, parameters.D.Length);
                }
 
-               private byte[] GetNamedParam (SecurityElement se, string param) 
-               {
-                       SecurityElement sep = se.SearchForChildByTag (param);
-                       if (sep == null)
-                               return null;
-                       return Convert.FromBase64String (sep.Text);
-               }
-
                public override void FromXmlString (string xmlString) 
                {
                        if (xmlString == null)
@@ -99,18 +89,14 @@ namespace System.Security.Cryptography {
 
                        RSAParameters rsaParams = new RSAParameters ();
                        try {
-                               SecurityParser sp = new SecurityParser ();
-                               sp.LoadXml (xmlString);
-                               SecurityElement se = sp.ToXml ();
-
-                               rsaParams.P = GetNamedParam (se, "P");
-                               rsaParams.Q = GetNamedParam (se, "Q");
-                               rsaParams.D = GetNamedParam (se, "D");
-                               rsaParams.DP = GetNamedParam (se, "DP");
-                               rsaParams.DQ = GetNamedParam (se, "DQ");
-                               rsaParams.InverseQ = GetNamedParam (se, "InverseQ");
-                               rsaParams.Exponent = GetNamedParam (se, "Exponent");
-                               rsaParams.Modulus = GetNamedParam (se, "Modulus");
+                               rsaParams.P = GetNamedParam (xmlString, "P");
+                               rsaParams.Q = GetNamedParam (xmlString, "Q");
+                               rsaParams.D = GetNamedParam (xmlString, "D");
+                               rsaParams.DP = GetNamedParam (xmlString, "DP");
+                               rsaParams.DQ = GetNamedParam (xmlString, "DQ");
+                               rsaParams.InverseQ = GetNamedParam (xmlString, "InverseQ");
+                               rsaParams.Exponent = GetNamedParam (xmlString, "Exponent");
+                               rsaParams.Modulus = GetNamedParam (xmlString, "Modulus");
                                ImportParameters (rsaParams);
                        }
                        catch (Exception e) {