Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@ -84,6 +84,8 @@ namespace Mono.Net.Security
if (initialized)
return;
SystemDependencyProvider.Initialize ();
InitializeProviderRegistration ();
MSI.MonoTlsProvider provider;
@ -99,8 +101,6 @@ namespace Mono.Net.Security
if (!providerCache.ContainsKey (provider.ID))
providerCache.Add (provider.ID, provider);
X509Helper2.Initialize ();
defaultProvider = provider;
initialized = true;
}
@ -112,9 +112,10 @@ namespace Mono.Net.Security
if (initialized)
throw new NotSupportedException ("TLS Subsystem already initialized.");
SystemDependencyProvider.Initialize ();
defaultProvider = LookupProvider (provider, true);
X509Helper2.Initialize ();
initialized = true;
}
}