[mobile_static] Fixed AES class usage for mobile_static profile

diff --git a/mcs/class/System.Core/mobile_static_System.Core.dll.sources b/mcs/class/System.Core/mobile_static_System.Core.dll.sources
index 7d32d44a88bd84c6036228fd2caebd01a9efbf7b..832b60883c7e68932e3ead4b03113facb4999cf3 100644 (file)
--- a/mcs/class/System.Core/mobile_static_System.Core.dll.sources
+++ b/mcs/class/System.Core/mobile_static_System.Core.dll.sources
@@ -1,2 +1,19 @@
 #include common_System.Core.dll.sources
 #include interpreter_System.Core.dll.sources
+
+System.Security.Cryptography/AesCryptoServiceProvider.cs
+System.Security.Cryptography/AesTransform.cs
+System.Security.Cryptography/CngAlgorithm.cs
+System.Security.Cryptography/CngAlgorithmGroup.cs
+System.Security.Cryptography/MD5Cng.cs
+System.Security.Cryptography/SHA1Cng.cs
+System.Security.Cryptography/SHA256Cng.cs
+System.Security.Cryptography/SHA256CryptoServiceProvider.cs
+System.Security.Cryptography/SHA384Cng.cs
+System.Security.Cryptography/SHA384CryptoServiceProvider.cs
+System.Security.Cryptography/SHA512Cng.cs
+System.Security.Cryptography/SHA512CryptoServiceProvider.cs
+
+../../../external/referencesource/System.Core/System/Security/Cryptography/AesManaged.cs
+../../../external/referencesource/System.Core/System/Security/Cryptography/ECDiffieHellman.cs
+../../../external/referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs
index b9cc49f146459c7400eb5504861e325533978fc1..9282679690814c32a72134538a7fba718d95e254 100755 (executable)
--- a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs
@@ -169,7 +169,11 @@ namespace System.Security.Cryptography {
                                name = "System.Security.Cryptography.X509Certificates.X509Chain, System";
                                break;
                        case "aes":
+#if MOBILE_STATIC
+                               name = "System.Security.Cryptography.AesCryptoServiceProvider, System.Core";
+#else
                                name = "System.Security.Cryptography.AesManaged, System.Core";
+#endif
                                break;
                        }
 

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs
index 778e5f60d9614d34449583b200d7d4265d630ecf..e93744c0fd8f7044cb32b6e3b8deb537bd44b4db 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs
@@ -44,11 +44,12 @@ namespace MonoTests.System.Security.Cryptography {
 
                [Test]
                [Category ("AndroidNotWorking")] // Exception is thrown: CryptographicException : Bad PKCS7 padding. Invalid length 236.
+               [Category ("MobileNotWorking")] // On mobile_static, above exception is thrown as well
                public void Roundtrip ()
                {
                        // that will return a AesCryptoServiceProvider
                        var aes = GetInstance ();
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH
                        Assert.AreEqual ("System.Security.Cryptography.AesManaged", aes.ToString (), "Default");
                        Assert.AreEqual (128, aes.FeedbackSize, "FeedbackSize");
 #else