In Mono.Security.Cryptography:

2009-04-29  Sebastien Pouliot  <sebastien@ximian.com>

	* PKCS1.cs: Make this work under NET_2_1 where SHA384 and SHA512
	are not available in the BCL.

In System.Security.Cryptography:
2009-04-29  Sebastien Pouliot  <sebastien@ximian.com>

	* DES.cs, DESCryptoServiceProvider.cs: Do not include in NET_2_1
	* HMACMD5.cs, HMACRIPEMD160.cs, HMACSHA384.cs, HMACSHA512.cs: Do
	not include in NET_2_1
	* MACTripleDES.cs: Do not include in NET_2_1
	* RC2.cs, RC2CryptoServiceProvider.cs: Do not include in NET_2_1
	* Rijndael.cs, RijndaelManaged.cs, RijndaelManagedTransform.cs:
	Do not include in NET_2_1 (AES is available in System.Core.dll)
	* RIPEMD160.cs, RIPEMD160Managed.cs: Do not include in NET_2_1
	* SHA1CryptoServiceProvider.cs: Do not include in NET_2_1, however
	SHA1Managed is available.
	* SHA384.cs, SHA384Managed.cs: Do not include in NET_2_1
	* SHA512.cs, SHA512Managed.cs: Do not include in NET_2_1
	* TripleDES.cs, TripleDESCryptoServiceProvider.cs: Do not include
	in NET_2_1

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

diff --git a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
index f56354d78731cf0f158b834b8ab8cb35d61172d4..96a0e2d4eddab2cf9614180943f125436f5f33f7 100644 (file)
--- a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-29  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * PKCS1.cs: Make this work under NET_2_1 where SHA384 and SHA512
+       are not available in the BCL.
+
 2008-08-07  Sebastien Pouliot  <sebastien@ximian.com>
 
        * SymmetricTransform.cs: Make this (more) usable with SL2 limited

diff --git a/mcs/class/corlib/Mono.Security.Cryptography/PKCS1.cs b/mcs/class/corlib/Mono.Security.Cryptography/PKCS1.cs
index 2aad2426d971231e8e94322f5d8ef1fa6498ea3c..3ca015f9e3b35c6780247d9c23f51c5d42627d45 100644 (file)
--- a/mcs/class/corlib/Mono.Security.Cryptography/PKCS1.cs
+++ b/mcs/class/corlib/Mono.Security.Cryptography/PKCS1.cs
@@ -77,10 +77,12 @@ namespace Mono.Security.Cryptography {
                                return emptySHA1;
                        else if (hash is SHA256)
                                return emptySHA256;
+#if !NET_2_1
                        else if (hash is SHA384)
                                return emptySHA384;
                        else if (hash is SHA512)
                                return emptySHA512;
+#endif
                        else
                                return hash.ComputeHash ((byte[])null);
                }

diff --git a/mcs/class/corlib/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
index c189996f57199ee02b293f6bf2db1ffb59841b7c..b8022fa6f1097f85b7bdc61d541322591d7a4bc9 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
@@ -1,3 +1,20 @@
+2009-04-29  Sebastien Pouliot  <sebastien@ximian.com> 
+
+       * DES.cs, DESCryptoServiceProvider.cs: Do not include in NET_2_1
+       * HMACMD5.cs, HMACRIPEMD160.cs, HMACSHA384.cs, HMACSHA512.cs: Do 
+       not include in NET_2_1
+       * MACTripleDES.cs: Do not include in NET_2_1
+       * RC2.cs, RC2CryptoServiceProvider.cs: Do not include in NET_2_1
+       * Rijndael.cs, RijndaelManaged.cs, RijndaelManagedTransform.cs:
+       Do not include in NET_2_1 (AES is available in System.Core.dll)
+       * RIPEMD160.cs, RIPEMD160Managed.cs: Do not include in NET_2_1
+       * SHA1CryptoServiceProvider.cs: Do not include in NET_2_1, however
+       SHA1Managed is available.
+       * SHA384.cs, SHA384Managed.cs: Do not include in NET_2_1
+       * SHA512.cs, SHA512Managed.cs: Do not include in NET_2_1
+       * TripleDES.cs, TripleDESCryptoServiceProvider.cs: Do not include
+       in NET_2_1
+
 2009-04-29  Sebastien Pouliot  <sebastien@ximian.com>
 
        * CryptoConfig.cs: Change to partial class and don't include this

diff --git a/mcs/class/corlib/System.Security.Cryptography/DES.cs b/mcs/class/corlib/System.Security.Cryptography/DES.cs
index 4fa766da7a30332efb6ebcef1aea6a54719ca8e3..ceb597214f7e53b617dfecec090678c98b62f3ae 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/DES.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/DES.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Globalization;
 using System.Runtime.InteropServices;
 
@@ -191,3 +193,6 @@ public abstract class DES : SymmetricAlgorithm {
 }
 
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs
index d8ca27891ce106c9cec5c1e2d8e3ca0294c32cd7..4336fe7bc043f0aae44417d538fbcbb14c7cc014 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 using Mono.Security.Cryptography;
 
@@ -689,3 +691,6 @@ namespace System.Security.Cryptography {
                }
        }
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs b/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs
index 44659b62f177bd7bdeecefca44fd438c1a408c76..c504f56733520c767c3b7e8525f3f63d4bafd008 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs b/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs
index 2720e17da7b555571358ed550dbdeaa01f6ee878..d6cac70ee3c2efe8800f227a545d28dba45f49c7 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs
index 2a40ecd9939a9db2b5b67ec0034b8d7f7f374144..f5d272104acbf36abfa79f2ed7b2645155a8f991 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs
index 09eeb5d8262e3ec616dc0df5b22f339d881f683b..113ec2066cd8c728108290680c6a4024a99607e4 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/MACTripleDES.cs b/mcs/class/corlib/System.Security.Cryptography/MACTripleDES.cs
index 623efb53e7940767ef42584fcbd6d2c334e48a26..303de11c82e26f6b805a65cd38b1a12cc0967b86 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/MACTripleDES.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/MACTripleDES.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 
 using Mono.Security.Cryptography;
@@ -153,3 +155,6 @@ namespace System.Security.Cryptography {
                }
        }
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/RC2.cs b/mcs/class/corlib/System.Security.Cryptography/RC2.cs
index e402770505ea35dac3af9fae438f71815db60905..e24eccd74fb086cecd20acdaffc1fdf724f6a8c1 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RC2.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RC2.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 
 namespace System.Security.Cryptography {
@@ -92,3 +94,6 @@ namespace System.Security.Cryptography {
                }
        }
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/RC2CryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/RC2CryptoServiceProvider.cs
index ce49e0803a3864538f0144f1ab2fb87a0e67b113..e43834b0efd91fc2c5533c6705c0dc4589e0dbf5 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RC2CryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RC2CryptoServiceProvider.cs
@@ -28,6 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Globalization;
 using System.Runtime.InteropServices;
 
@@ -321,3 +323,6 @@ namespace System.Security.Cryptography {
                };
        }
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs
index 9b936c95d78f0c1a1ec7640bc761dd6bc17fed78..257121e63d48dc35a06bf65f694ebfbee7656a3d 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs
@@ -27,7 +27,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs
index 0397cf166ecfff8744e86a580eaec12524cee616..250cfa80542dd66bc9ffa5f64e57cda5c71291ec 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs b/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
index 4104dfbd909d5afeb38bc4eadbe7c8b580f2615b..1a67b8e43abccb6d1647ed87383a26b3cf8e7610 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 !NET_2_1
 \r
 using System.Runtime.InteropServices;
 \r
@@ -68,3 +70,5 @@ namespace System.Security.Cryptography {
                }\r
        }\r
 }\r
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs b/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs
index 0cec18a0d374cae0e624420c1fef1b2184119a70..a4de45bc062e2d1306943803fa1223b439223c18 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs
@@ -31,6 +31,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 using Mono.Security.Cryptography;
 
@@ -1460,3 +1462,6 @@ namespace System.Security.Cryptography {
                #endregion
        }
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/RijndaelManagedTransform.cs b/mcs/class/corlib/System.Security.Cryptography/RijndaelManagedTransform.cs
index e4bf019f610e755968a67794f83816a908bcb7f4..31e20cf49187ef2efd2e1c1805515f78eeeb22ba 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/RijndaelManagedTransform.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/RijndaelManagedTransform.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
+#if NET_2_0 && !NET_2_1
 
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs
index 7a96e16586d99ada0ca54c71e7253a73e21be7be..512b04cc48540007a7e13c6c3d711996dd708432 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs
@@ -317,6 +317,8 @@ namespace System.Security.Cryptography {
                }
        }
 
+#if !NET_2_1
+
 #if NET_2_0
        [ComVisible (true)]
 #endif
@@ -357,4 +359,5 @@ namespace System.Security.Cryptography {
                        sha.Initialize ();
                }
        }
+#endif // NET_2_1
 }

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA384.cs b/mcs/class/corlib/System.Security.Cryptography/SHA384.cs
index 4ede5d50edf0be854f01a522877fd9d9378a6f31..23265a908ddfdb2e00d8e2b752d5951cdf5e0c16 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SHA384.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA384.cs
@@ -29,6 +29,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 \r
 namespace System.Security.Cryptography {\r
@@ -58,3 +60,5 @@ namespace System.Security.Cryptography {
                }\r
        }\r
 }\r
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs b/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs
index 3314d1559b0f4440247bb6c662390f097a76b54f..04a0b46a45b1c10b6dbe533784039e1486bb0088 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs
@@ -30,6 +30,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 
 namespace System.Security.Cryptography {
@@ -259,3 +261,6 @@ public class SHA384Managed : SHA384 {
 }
 
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA512.cs b/mcs/class/corlib/System.Security.Cryptography/SHA512.cs
index a17b8f2b995bfee9b6f78dbaf80baa13b4691d17..6ec92207bfaa53f8fe155b9f62bf11175f735965 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SHA512.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA512.cs
@@ -29,6 +29,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 \r
 namespace System.Security.Cryptography {\r
@@ -58,3 +60,5 @@ namespace System.Security.Cryptography {
                }\r
        }\r
 }\r
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs b/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs
index cb7d8b5b8e1db94a593c68cc58366d3aad2efb4e..128605fb4690aa1608f82e3c4a61b4a158294ac1 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs
@@ -30,6 +30,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 
 namespace System.Security.Cryptography {
@@ -282,3 +284,6 @@ public class SHA512Managed : SHA512 {
 }
 
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
index 4c818a3f8a23a8e4791d1f8bc6f4ca3c85b88d70..98166aaafd4f352877ad3d9c6bfc8d62423a83a2 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
@@ -139,3 +141,6 @@ public abstract class TripleDES : SymmetricAlgorithm {
 }
 
 }
+
+#endif
+

diff --git a/mcs/class/corlib/System.Security.Cryptography/TripleDESCryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/TripleDESCryptoServiceProvider.cs
index b0da7beb3ac0bc35b295b0845b4e8a82f16f5d6d..e1899ef51989974e2c23a86a122be57f294c25ff 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/TripleDESCryptoServiceProvider.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/TripleDESCryptoServiceProvider.cs
@@ -27,6 +27,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !NET_2_1
+
 using System.Runtime.InteropServices;
 using Mono.Security.Cryptography;
 
@@ -147,3 +149,6 @@ namespace System.Security.Cryptography {
                }
        }
 }
+
+#endif
+