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

Imported Upstream version 4.8.0.495

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/System/Mono.Btls/MonoBtlsContext.cs
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);

28
mcs/class/System/Mono.Btls/MonoBtlsProvider.cs
View File

@@ -150,7 +150,7 @@ namespace Mono.Btls
using (var nativeChain = MonoBtlsProvider.GetNativeChain (certificates))
using (var param = GetVerifyParam (targetHost, serverMode))
using (var storeCtx = new MonoBtlsX509StoreCtx ()) {
SetupCertificateStore (store);
SetupCertificateStore (store, validator.Settings, serverMode);
storeCtx.Initialize (store, nativeChain);
@@ -201,19 +201,45 @@ namespace Mono.Btls
}
}
internal static void SetupCertificateStore (MonoBtlsX509Store store, MonoTlsSettings settings, bool server)
{
AddTrustedRoots (store, settings, server);
SetupCertificateStore (store);
}
internal static void SetupCertificateStore (MonoBtlsX509Store store)
{
#if MONODROID
store.SetDefaultPaths ();
store.AddAndroidLookup ();
#else
AddUserStore (store);
AddMachineStore (store);
#endif
}
#if !MONODROID
static void AddUserStore (MonoBtlsX509Store store)
{
var userPath = MonoBtlsX509StoreManager.GetStorePath (MonoBtlsX509StoreType.UserTrustedRoots);
if (Directory.Exists (userPath))
store.AddDirectoryLookup (userPath, MonoBtlsX509FileType.PEM);
}
static void AddMachineStore (MonoBtlsX509Store store)
{
var machinePath = MonoBtlsX509StoreManager.GetStorePath (MonoBtlsX509StoreType.MachineTrustedRoots);
if (Directory.Exists (machinePath))
store.AddDirectoryLookup (machinePath, MonoBtlsX509FileType.PEM);
}
#endif
static void AddTrustedRoots (MonoBtlsX509Store store, MonoTlsSettings settings, bool server)
{
if (settings?.TrustAnchors == null)
return;
var trust = server ? MonoBtlsX509TrustKind.TRUST_CLIENT : MonoBtlsX509TrustKind.TRUST_SERVER;
store.AddCollection (settings.TrustAnchors, trust);
}
public static string GetSystemStoreLocation ()

3
mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs
View File

@@ -159,8 +159,7 @@ namespace Mono.Btls
internal void AddTrustedRoots ()
{
var systemRoot = MonoBtlsProvider.GetSystemStoreLocation ();
LoadLocations (null, systemRoot);
MonoBtlsProvider.SetupCertificateStore (this);
}
public MonoBtlsX509Lookup AddLookup (MonoBtlsX509LookupType type)