From 38b82a9dd86ddf6f0c1817a7a0b71e4642addfd2 Mon Sep 17 00:00:00 2001 From: goat Date: Thu, 6 Feb 2020 22:23:02 +0900 Subject: [PATCH] fix: enable all SSL types in EntryPoint --- Dalamud/Data/DataManager.cs | 6 ------ Dalamud/EntryPoint.cs | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs index 3b9713ebf..2cf8202f7 100644 --- a/Dalamud/Data/DataManager.cs +++ b/Dalamud/Data/DataManager.cs @@ -31,10 +31,6 @@ namespace Dalamud.Data try { Log.Verbose("Starting data download..."); - // This is due to GitHub not supporting TLS 1.0 - System.Net.ServicePointManager.SecurityProtocol = - SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; - using var client = new HttpClient() { BaseAddress = new Uri(DataBaseUrl) }; @@ -52,8 +48,6 @@ namespace Dalamud.Data Log.Verbose("Loaded {0} ContentFinderCondition.", cfcs.Count); - System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault; - IsDataReady = true; } catch (Exception ex) { Log.Error(ex, "Could not download data."); diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 62949d32b..232640f5e 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Net; using Dalamud.Interface; using EasyHook; using Serilog; @@ -18,6 +19,10 @@ namespace Dalamud { try { Log.Information("Initializing a session.."); + // This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally + System.Net.ServicePointManager.SecurityProtocol = + SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls; + // Log any unhandled exception. AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;