Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@@ -159,17 +159,16 @@ namespace Mono
if (cert.Impl == null)
return null;
X509Certificate2Impl impl = null;
var impl = cert.Impl as X509Certificate2Impl;
if (impl != null)
return (X509Certificate2Impl)impl.Clone ();
if ((importFlags & CertificateImportFlags.DisableNativeBackend) == 0) {
impl = X509Pal.Import (cert);
if (impl != null)
return impl;
}
impl = cert.Impl as X509Certificate2Impl;
if (impl != null)
return (X509Certificate2Impl)impl.Clone ();
if ((importFlags & CertificateImportFlags.DisableAutomaticFallback) != 0)
return null;