mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.12.0.220

Browse Source 
Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System/System.Security.Cryptography.X509Certificates/X509Helper2.cs
View File

@ -126,6 +126,9 @@ namespace System.Security.Cryptography.X509Certificates
internal static X509Certificate2Impl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags, bool disableProvider = false)
{
if (rawData == null || rawData.Length == 0)
return null;
#if MONO_FEATURE_BTLS
if (!disableProvider) {
var provider = MonoTlsProviderFactory.GetProvider ();
@ -142,6 +145,9 @@ namespace System.Security.Cryptography.X509Certificates
internal static X509Certificate2Impl Import (X509Certificate cert, bool disableProvider = false)
{
if (cert.Impl == null)
return null;
#if MONO_FEATURE_BTLS
if (!disableProvider) {
var provider = MonoTlsProviderFactory.GetProvider ();