diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2008-06-26 16:49:33 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2008-06-26 16:49:33 +0400 |
| commit | 62ba7e0cfaafb526aa5cc6f5b8fe0a45470f93ad (patch) | |
| tree | 3f7a7d31d87d9db9b4f94afcc030e07e855f08ab /mcs/class/System/System.Security.Cryptography.X509Certificates | |
| parent | 3ff38230887b748af6e96a59cbd6da8c0fe0c23d (diff) | |
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
Diffstat (limited to 'mcs/class/System/System.Security.Cryptography.X509Certificates')
| -rw-r--r-- | mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2.cs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog index 5d37834791c..49a835e0b35 100644 --- 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 bb588d41cb9..f6f58531b3c 100644 --- 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) |