Imported Upstream version 4.8.0.495

Former-commit-id: 7ac3d9a0512daf5dbdfccee163b153a77fda675c
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-02-22 17:45:59 +00:00
parent 702a3ab1af
commit af08d800c3
19 changed files with 42 additions and 26 deletions

View File

@ -207,16 +207,6 @@ namespace Mono.Btls
isAuthenticated = true;
}
void SetupCertificateStore ()
{
MonoBtlsProvider.SetupCertificateStore (ctx.CertificateStore);
if (Settings != null && Settings.TrustAnchors != null) {
var trust = IsServer ? MonoBtlsX509TrustKind.TRUST_CLIENT : MonoBtlsX509TrustKind.TRUST_SERVER;
ctx.CertificateStore.AddCollection (Settings.TrustAnchors, trust);
}
}
void InitializeConnection ()
{
ctx = new MonoBtlsSslCtx ();
@ -226,7 +216,7 @@ namespace Mono.Btls
ctx.SetDebugBio (errbio);
#endif
SetupCertificateStore ();
MonoBtlsProvider.SetupCertificateStore (ctx.CertificateStore, Settings, IsServer);
if (!IsServer || AskForClientCertificate)
ctx.SetVerifyCallback (VerifyCallback, false);