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

@@ -2,7 +2,7 @@
#if SECURITY_DEP
using System;
using MSI = Mono.Security.Interface;
#if HAVE_BTLS
#if MONO_FEATURE_BTLS
using Mono.Btls;
#endif
@@ -18,14 +18,12 @@ namespace Mono.Net.Security
case null:
case "default":
case "legacy":
return new Private.MonoLegacyTlsProvider ();
return new LegacyTlsProvider ();
#if MONO_FEATURE_BTLS
case "btls":
#if HAVE_BTLS
if (!MonoBtlsProvider.IsSupported ())
if (!IsBtlsSupported ())
throw new NotSupportedException ("BTLS in not supported!");
return new MonoBtlsProvider ();
#else
throw new NotSupportedException ("BTLS in not supported!");
#endif
default:
throw new NotSupportedException (string.Format ("Invalid TLS Provider: `{0}'.", provider));