From f7bb3d1ff7f6d8d05d49551d5fe3970d0690e18a Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 22 Sep 2009 12:27:33 +0000 Subject: [PATCH] 2009-09-22 Sebastien Pouliot * X509Certificate20.cs: Don't depend on SecureString for NET_2_1 svn path=/trunk/mcs/; revision=142388 --- .../ChangeLog | 4 ++++ .../X509Certificate20.cs | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/ChangeLog index 558105ad7c2..115cbc6462f 100644 --- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/ChangeLog +++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/ChangeLog @@ -1,3 +1,7 @@ +2009-09-22 Sebastien Pouliot + + * X509Certificate20.cs: Don't depend on SecureString for NET_2_1 + 2009-05-02 Sebastien Pouliot * X509Certificate.cs: Remove code to initialize from an handle diff --git a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs index dac7779a0be..473dbae0361 100644 --- a/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs +++ b/mcs/class/corlib/System.Security.Cryptography.X509Certificates/X509Certificate20.cs @@ -61,22 +61,26 @@ namespace System.Security.Cryptography.X509Certificates { Import (rawData, password, X509KeyStorageFlags.DefaultKeySet); } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete")] public X509Certificate (byte[] rawData, SecureString password) { Import (rawData, password, X509KeyStorageFlags.DefaultKeySet); } +#endif public X509Certificate (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags) { Import (rawData, password, keyStorageFlags); } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete")] public X509Certificate (byte[] rawData, SecureString password, X509KeyStorageFlags keyStorageFlags) { Import (rawData, password, keyStorageFlags); } +#endif public X509Certificate (string fileName) { @@ -88,22 +92,26 @@ namespace System.Security.Cryptography.X509Certificates { Import (fileName, password, X509KeyStorageFlags.DefaultKeySet); } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete")] public X509Certificate (string fileName, SecureString password) { Import (fileName, password, X509KeyStorageFlags.DefaultKeySet); } +#endif public X509Certificate (string fileName, string password, X509KeyStorageFlags keyStorageFlags) { Import (fileName, password, keyStorageFlags); } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete")] public X509Certificate (string fileName, SecureString password, X509KeyStorageFlags keyStorageFlags) { Import (fileName, password, keyStorageFlags); } +#endif public X509Certificate (SerializationInfo info, StreamingContext context) { @@ -164,12 +172,14 @@ namespace System.Security.Cryptography.X509Certificates { return Export (contentType, pwd); } +#if !NET_2_1 [MonoTODO ("X509ContentType.Pfx/Pkcs12 and SerializedCert are not supported. SecureString support is incomplete.")] public virtual byte[] Export (X509ContentType contentType, SecureString password) { byte[] pwd = (password == null) ? null : password.GetBuffer (); return Export (contentType, pwd); } +#endif internal byte[] Export (X509ContentType contentType, byte[] password) { @@ -247,11 +257,13 @@ namespace System.Security.Cryptography.X509Certificates { } } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete")] public virtual void Import (byte[] rawData, SecureString password, X509KeyStorageFlags keyStorageFlags) { Import (rawData, (string)null, keyStorageFlags); } +#endif [ComVisible (false)] public virtual void Import (string fileName) @@ -268,12 +280,15 @@ namespace System.Security.Cryptography.X509Certificates { Import (rawData, password, keyStorageFlags); } +#if !NET_2_1 [MonoTODO ("SecureString support is incomplete, missing KeyStorageFlags support")] public virtual void Import (string fileName, SecureString password, X509KeyStorageFlags keyStorageFlags) { byte[] rawData = Load (fileName); Import (rawData, (string)null, keyStorageFlags); } +#endif + #if !NET_2_1 || MONOTOUCH void IDeserializationCallback.OnDeserialization (object sender) { -- 2.11.4.GIT