From af08d800c37bac87e1e4cd1e2f019dfcfa3b5e61 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 22 Feb 2017 17:45:59 +0000 Subject: [PATCH] Imported Upstream version 4.8.0.495 Former-commit-id: 7ac3d9a0512daf5dbdfccee163b153a77fda675c --- mcs/class/System/Mono.Btls/MonoBtlsContext.cs | 12 +------- .../System/Mono.Btls/MonoBtlsProvider.cs | 28 +++++++++++++++++- .../System/Mono.Btls/MonoBtlsX509Store.cs | 3 +- .../lib/monolite/System.dll.REMOVED.git-id | 2 +- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/mini.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/utils/mono-threads-posix.c | 3 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 19 files changed, 42 insertions(+), 26 deletions(-) diff --git a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs index 339ce4e57c..58cb66d526 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsContext.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsContext.cs @@ -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); diff --git a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs index 842dc5b50d..eeff050a77 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs @@ -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 () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs index 537993566e..3aafbd4a7f 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs @@ -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) diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 748f6bbe40..f0155719d2 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -5e769f86c6e601eeed6a547e159a1e065ec48f06 \ No newline at end of file +dd943c55962ea9b83f4ea03f975d288bc9cef06b \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 76d27664e5..f35b67c801 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.495/e4a3cf3\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 76d27664e5..f35b67c801 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -861,7 +861,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.489/9ac5bf2\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.495/e4a3cf3\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index e207d3d3d7..c20749e0c9 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -d78d3160cb95346fa22eb7f257a9e51030af6b97 \ No newline at end of file +1d2d50a79752da03d88b373dcfa4536e767c289d \ No newline at end of file diff --git a/mono/mini/mini.c.REMOVED.git-id b/mono/mini/mini.c.REMOVED.git-id index b75b086883..de14bfad90 100644 --- a/mono/mini/mini.c.REMOVED.git-id +++ b/mono/mini/mini.c.REMOVED.git-id @@ -1 +1 @@ -8f2ef218cc4e9047676a88b73fef6c609e45b6fd \ No newline at end of file +1b752cd4d3afff4c3c4fa86f3c53cad92fa6ca37 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 43ae24d8ae..a6daccadf0 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.489/9ac5bf2" +#define FULL_VERSION "Stable 4.8.0.495/e4a3cf3" diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c index de38adf137..1af813deba 100644 --- a/mono/utils/mono-threads-posix.c +++ b/mono/utils/mono-threads-posix.c @@ -379,7 +379,8 @@ mono_threads_platform_set_priority (MonoThreadInfo *info, MonoThreadPriority pri param.sched_priority = 0; break; default: - g_error ("%s: unknown policy %d", __func__, policy); + g_warning ("%s: unknown policy %d", __func__, policy); + return; } } diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index c0b168cce4403093d4b5fbd4ba85275d17f5b93a..9a852c3e801b87d342eee338f79e7997856e536e 100644 GIT binary patch delta 21 ccmbQIHBW296D|%TBLzcqD?@|LZ@7%O08kVLqW}N^ delta 21 ccmbQIHBW296D|%zQw0M{D`V5mZ@7%O08n2BtpET3 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 286f652a5b..d59dbc2fd9 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -da2fd49923155b32b5bca18fb07cf7c7e320a8dc \ No newline at end of file +24891e68bb877147f45264905411a3d29b9697a2 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 49089190b766a3f346fd08b3b9caee91cf22f1b2..2a1afab371e8fd9b79a0defe4ed2005d7f22b899 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et#k%FPQm7&3AQ^hHA09TX-*#H0l delta 21 ccmX?Ef3kjqt|Et_se*x}m9gn&Q^hHA09W4z;{X5v diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index c307df86b1..3e210cacf7 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -e4a9bbec1f2d716b4b646529ce5394539d5aaf92 \ No newline at end of file +9a0004e54942d65f96b8db4923ab25ae00b98111 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d7a1064ac0f69b56b039e957706a3f80f57bc762..174de281e7a4f6ff71dc8ea1cc54e2c2ede0042d 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ197aY8hUQj=2AlcS3$y@ddIvQC delta 23 ecmeyri1Gg-#trQ19EPR}29{RFrknZI3$y@d#RoqC diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 1f4feb8184..c42cb3c3d2 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -6b60ac7183d65ee9d7f074c8a23f3799d762e2b6 \ No newline at end of file +23ce3caec9ef14b46dd2699cb25dc0b6ba1e24b2 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index fa474c2c8c..a66306f857 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.8.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2017-02-15 09:35+0000\n" +"POT-Creation-Date: 2017-02-22 17:10+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 13329957a105b5774db96d871c5385a51d4f5672..b091dfd1e1188a3687fe794062a8abf2040983fd 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AIE;)G49%?!4K^!IThR^xY~cu) delta 23 fcmX@Po8{zgmJO2AI1Eh{3@ojTO*bn}ThR^xZ7c|) diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index ac6c3daccb..7140b8a6c2 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -593851f8ddc8ae23de4aecfe19261ca7f69713f9 \ No newline at end of file +d89d14404907c8feee684d37888501a226d846e8 \ No newline at end of file