Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -483,6 +483,7 @@ namespace System.Security.Cryptography.X509Certificates
[MonoTODO ("missing KeyStorageFlags support")]
public override void Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
{
Reset ();
MX.X509Certificate cert = null;
if (password == null) {
try {
@@ -718,6 +719,10 @@ namespace System.Security.Cryptography.X509Certificates
internal MX.X509Certificate MonoCertificate {
get { return _cert; }
}
internal override X509Certificate2Impl FallbackImpl {
get { return this; }
}
}
}