Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -42,7 +42,7 @@ namespace Mono.Net.Security
{
#if MONOTOUCH
is_macosx = true;
#elif MONODROID
#elif MONODROID || ORBIS
is_macosx = false;
#else
is_macosx = Environment.OSVersion.Platform != PlatformID.Win32NT && System.IO.File.Exists (OSX509Certificates.SecurityLibrary);
@ -156,6 +156,7 @@ namespace Mono.Net.Security
}
#else
if (is_macosx) {
#if !ORBIS
// Attempt to use OSX certificates
// Ideally we should return the SecTrustResult
OSX509Certificates.SecTrustResult trustResult = OSX509Certificates.SecTrustResult.Deny;
@ -180,6 +181,9 @@ namespace Mono.Net.Security
status11 = (int)trustResult;
errors |= SslPolicyErrors.RemoteCertificateChainErrors;
}
#else
throw new PlatformNotSupportedException ();
#endif
} else {
result = BuildX509Chain (certs, chain, ref errors, ref status11);
}