diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index f632295b..69030399 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -98,6 +98,7 @@ namespace ServerManagerTool Title = string.Empty; Version = AppUtils.GetDeployedVersion(Assembly.GetEntryAssembly()); + ServicePointManager.SecurityProtocol = SecurityUtils.GetSecurityProtocol(0xC00 + 0x3000); // TLS12, TLS13 AppDomain.CurrentDomain.UnhandledException += ErrorHandling.CurrentDomain_UnhandledException; MigrateSettings(); @@ -324,8 +325,6 @@ namespace ServerManagerTool { base.OnStartup(e); - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; - _globalizer = GlobalizedApplication.Instance; try { diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 002a2b96..f9f217fc 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:2C48A585-72D2-43FB-8987-6B5F0B3E460F - 1.1.425 (1.1.425.2) - 1.1.425.2 + 1.1.425 (1.1.425.3) + 1.1.425.3 2022-05-06T00:00:00Z @@ -22,6 +22,7 @@
  • Global Settings - added RCON broadcast mode droplist, so auto processes can send messages via RCON using this mode.
  • Auto Processes - changed the message broadcast to use the new config setting, not a hardcoded value.
  • Auto Backup Settings - added RCON broadcast mode droplist, so backup processes can send messages via RCON using this mode.
    • +
  • Security Protocol Changes - updated the security protocols to use TLS12 and TLS13.

    • diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index da35c2b3..5d667f58 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-05-06T00:00:00Z + + urn:uuid:606BA376-9AB5-46D9-8533-0BEBF841934E + 1.1.425 (1.1.425.3) + 1.1.425.3 + + 2022-05-06T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Security Protocol Changes - updated the security protocols to use TLS12 and TLS13.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:E6701920-FF1E-48B7-B70A-18B9BC3592F7 1.1.425 (1.1.425.2) diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index 3069a1f4..b29b5ec0 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -97,6 +97,7 @@ namespace ServerManagerTool Title = string.Empty; Version = AppUtils.GetDeployedVersion(Assembly.GetEntryAssembly()); + ServicePointManager.SecurityProtocol = SecurityUtils.GetSecurityProtocol(0xC00 + 0x3000); // TLS12, TLS13 AppDomain.CurrentDomain.UnhandledException += ErrorHandling.CurrentDomain_UnhandledException; MigrateSettings(); @@ -323,8 +324,6 @@ namespace ServerManagerTool { base.OnStartup(e); - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; - _globalizer = GlobalizedApplication.Instance; try { diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index ca7188ef..5b294bea 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:AD8ABBB5-093A-4FDB-B473-FCED2DB46781 - 1.1.69 (1.1.69.1) - 1.1.69.1 + 1.1.69 (1.1.69.3) + 1.1.69.3 2022-05-06T00:00:00Z @@ -25,6 +25,7 @@
    • Auto Backup Settings - added RCON broadcast mode droplist, so backup processes can send messages via RCON using this mode.
      • +
    • Security Protocol Changes - updated the security protocols to use TLS12 and TLS13.

    diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 51307b00..4a28d5c4 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-05-06T00:00:00Z + + urn:uuid:92A777C4-75B2-468F-BC46-F42327A4D2D1 + 1.1.69 (1.1.69.3) + 1.1.69.3 + + 2022-05-06T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Security Protocol Changes - updated the security protocols to use TLS12 and TLS13.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:6AC9586B-1678-46B5-9FD7-86B20FB67293 1.1.69 (1.1.69.2) diff --git a/src/ServerManager.Common/Utils/SecurityUtils.cs b/src/ServerManager.Common/Utils/SecurityUtils.cs index f029a73e..2dcd3db6 100644 --- a/src/ServerManager.Common/Utils/SecurityUtils.cs +++ b/src/ServerManager.Common/Utils/SecurityUtils.cs @@ -3,6 +3,7 @@ using System; using System.Diagnostics; using System.DirectoryServices.AccountManagement; using System.IO; +using System.Net; using System.Security; using System.Security.AccessControl; using System.Security.Principal; @@ -284,5 +285,12 @@ namespace ServerManagerTool.Common.Utils } return secureString; } + + public static SecurityProtocolType GetSecurityProtocol(int securityProtocolValue) + { + if (Enum.TryParse(securityProtocolValue.ToString(), out SecurityProtocolType securityProtocol)) + return securityProtocol; + return SecurityProtocolType.Tls12; + } } } diff --git a/src/ServerManager.Updater/Program.cs b/src/ServerManager.Updater/Program.cs index ae0bdcb8..bef0c972 100644 --- a/src/ServerManager.Updater/Program.cs +++ b/src/ServerManager.Updater/Program.cs @@ -32,7 +32,7 @@ namespace ServerManagerTool.Updater { Console.Title = "Server Manager Updater"; - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12; + ServicePointManager.SecurityProtocol = SecurityUtils.GetSecurityProtocol(0xC00 + 0x3000); // TLS12, TLS13 var updaterArgs = args; ApplicationArgs = null; diff --git a/src/ServerManager.Updater/Utils/SecurityUtils.cs b/src/ServerManager.Updater/Utils/SecurityUtils.cs new file mode 100644 index 00000000..9892011b --- /dev/null +++ b/src/ServerManager.Updater/Utils/SecurityUtils.cs @@ -0,0 +1,15 @@ +using System; +using System.Net; + +namespace ServerManagerTool.Updater +{ + public static class SecurityUtils + { + public static SecurityProtocolType GetSecurityProtocol(int securityProtocolValue) + { + if (Enum.TryParse(securityProtocolValue.ToString(), out SecurityProtocolType securityProtocol)) + return securityProtocol; + return SecurityProtocolType.Tls12; + } + } +}