Merge pull request #16 from jukfiuune/dev

Fix TLS 1.2, which fixes WebSockets
Naticord · May 15, 2024 · d04c02c · d04c02c
2 parents 413c09c + b64c1e9
commit d04c02c
Show file tree

Hide file tree

Showing 16 changed files with 4,395 additions and 6,853 deletions.
diff --git a/.vs/Naticord/v15/.suo b/.vs/Naticord/v15/.suo
diff --git a/.vs/Naticord/v15/Server/sqlite3/storage.ide b/.vs/Naticord/v15/Server/sqlite3/storage.ide
diff --git a/.vs/Naticord/v15/Server/sqlite3/storage.ide-shm b/.vs/Naticord/v15/Server/sqlite3/storage.ide-shm
diff --git a/.vs/Naticord/v15/Server/sqlite3/storage.ide-wal b/.vs/Naticord/v15/Server/sqlite3/storage.ide-wal
diff --git a/Naticord/Naticord.cs b/Naticord/Naticord.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Security.Authentication;
 using System.Windows.Forms;
 using System.Linq;
 using WebSocketSharp;
@@ -317,6 +318,7 @@ public class WebSocketClient
         // this is broken! will be fixed soon
         private Naticord parentNaticordForm;
         private WebSocket webSocket;
+        public const SslProtocols Tls12 = (SslProtocols)0x00000C00;
 
         public WebSocketClient(string accessToken, Naticord parentNaticordForm)
         {
@@ -328,7 +330,7 @@ public WebSocketClient(string accessToken, Naticord parentNaticordForm)
         private void InitializeWebSocket(string accessToken)
         {
             webSocket = new WebSocket($"wss://gateway.discord.gg/?v=9&encoding=json");
-
+            webSocket.SslConfiguration.EnabledSslProtocols = Tls12;
             webSocket.OnMessage += (sender, e) => HandleWebSocketMessage(e.Data);
             string AccessToken = accessToken;
             webSocket.OnError += (sender, e) => HandleWebSocketError(e.Message);

diff --git a/Naticord/bin/Debug/Naticord.exe b/Naticord/bin/Debug/Naticord.exe
diff --git a/Naticord/bin/Debug/Naticord.pdb b/Naticord/bin/Debug/Naticord.pdb
diff --git a/Naticord/bin/Debug/websocket-sharp.dll b/Naticord/bin/Debug/websocket-sharp.dll
diff --git a/Naticord/bin/Debug/websocket-sharp.xml b/Naticord/bin/Debug/websocket-sharp.xml
diff --git a/Naticord/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Naticord/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Naticord/obj/Debug/Naticord.csproj.CoreCompileInputs.cache b/Naticord/obj/Debug/Naticord.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a421d5f984f21292524b55b48bcfdbaee1d3376d
+9bf190f85e3ebbd14b952de17514bab428daeb78
diff --git a/Naticord/obj/Debug/Naticord.csproj.FileListAbsolute.txt b/Naticord/obj/Debug/Naticord.csproj.FileListAbsolute.txt
@@ -13,3 +13,19 @@ C:\Users\Patrick\naticord-c#\Naticord\Naticord\obj\Debug\Naticord.csproj.CoreCom
 C:\Users\Patrick\naticord-c#\Naticord\Naticord\obj\Debug\Naticord.csproj.CopyComplete
 C:\Users\Patrick\naticord-c#\Naticord\Naticord\obj\Debug\Naticord.exe
 C:\Users\Patrick\naticord-c#\Naticord\Naticord\obj\Debug\Naticord.pdb
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\Naticord.exe
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\Naticord.pdb
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\Newtonsoft.Json.dll
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\websocket-sharp.dll
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\Newtonsoft.Json.xml
+C:\Users\admin\Documents\GitHub\naticord\Naticord\bin\Debug\websocket-sharp.xml
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.csprojAssemblyReference.cache
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.Login.resources
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.Naticord.resources
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.Properties.Resources.resources
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.Settings.resources
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.csproj.GenerateResource.cache
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.csproj.CoreCompileInputs.cache
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.csproj.CopyComplete
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.exe
+C:\Users\admin\Documents\GitHub\naticord\Naticord\obj\Debug\Naticord.pdb
diff --git a/Naticord/obj/Debug/Naticord.csproj.GenerateResource.cache b/Naticord/obj/Debug/Naticord.csproj.GenerateResource.cache
diff --git a/Naticord/obj/Debug/Naticord.csprojAssemblyReference.cache b/Naticord/obj/Debug/Naticord.csprojAssemblyReference.cache
diff --git a/Naticord/obj/Debug/Naticord.exe b/Naticord/obj/Debug/Naticord.exe
diff --git a/Naticord/obj/Debug/Naticord.pdb b/Naticord/obj/Debug/Naticord.pdb