2008-06-26 Sebastien Pouliot <sebastien@ximian.com>

	* X509Certificate2.cs: Allow password-less ctor to (try to) open
	PKCS#12 files (with an empty password).
	[Fix bug #403610]

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

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
index 5d37834791c80ac87ef3430e0e77c6ad22f8a7f7..49a835e0b35b461c7ac8e23fbae86982dc6ba8bb 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-26  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * X509Certificate2.cs: Allow password-less ctor to (try to) open 
+       PKCS#12 files (with an empty password).
+       [Fix bug #403610]
+
 2008-06-03  Sebastien Pouliot  <sebastien@ximian.com>
 
        * X509Certificate2.cs: Allow PrivateKey property to be set to null.

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
index bb588d41cb9298eae5d529e93c32072146aea4d5..f6f58531b3cf961d7a3c1aa95c1c23c145eb7125 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs
@@ -86,9 +86,9 @@ namespace System.Security.Cryptography.X509Certificates {
                        Import (rawData, password, keyStorageFlags);
                }
 
-               public X509Certificate2 (string fileName) : base (fileName) 
+               public X509Certificate2 (string fileName)
                {
-                       Import (fileName, (string)null, X509KeyStorageFlags.DefaultKeySet);
+                       Import (fileName, String.Empty, X509KeyStorageFlags.DefaultKeySet);
                }
 
                public X509Certificate2 (string fileName, string password)