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

@ -543,7 +543,14 @@ namespace System.ServiceModel.Security
bool hasPrivateKey = false;
try
{
hasPrivateKey = certificate != null && certificate.PrivateKey != null;
if (System.ServiceModel.LocalAppContextSwitches.DisableCngCertificates)
{
hasPrivateKey = certificate != null && certificate.PrivateKey != null;
}
else
{
hasPrivateKey = certificate.HasPrivateKey && SecurityUtils.CanReadPrivateKey(certificate);
}
}
catch (SecurityException e)
{