Initial work to change from RSA to DH key setup.

TODO: Fix code for tests.
Dtronix · Jun 14, 2018 · c6360a2 · c6360a2
1 parent 7c5570f
commit c6360a2
Show file tree

Hide file tree

Showing 7 changed files with 178 additions and 222 deletions.
diff --git a/src/DtronixMessageQueue.Tests/TestBase.cs b/src/DtronixMessageQueue.Tests/TestBase.cs
@@ -61,7 +61,7 @@ public static int FreeTcpPort()
         protected void StartAndWait(bool timeoutError = true, int timeoutLength = -1)
         {
             timeoutLength = timeoutLength != -1 ? timeoutLength : (int)TestTimeout.TotalMilliseconds;
-#if false
+#if true
             timeoutLength = 100000;
 #endif
 

diff --git a/src/DtronixMessageQueue/DtronixMessageQueue.csproj b/src/DtronixMessageQueue/DtronixMessageQueue.csproj
@@ -75,7 +75,6 @@
     <Compile Include="Rpc\ServiceMethodCache.cs" />
     <Compile Include="TcpSocket\BufferManager.cs" />
     <None Include="TcpSocket\EncryptedSocketSession.cs" />
-    <Compile Include="TcpSocket\ISecureSocketSession.cs" />
     <Compile Include="TcpSocket\ISetupSocketSession.cs" />
     <Compile Include="SessionEventArgs.cs" />
     <Compile Include="SessionClosedEventArgs.cs" />

diff --git a/src/DtronixMessageQueue/TcpSocket/ISecureSocketSession.cs b/src/DtronixMessageQueue/TcpSocket/ISecureSocketSession.cs
diff --git a/src/DtronixMessageQueue/TcpSocket/TcpSocketClient.cs b/src/DtronixMessageQueue/TcpSocket/TcpSocketClient.cs
@@ -97,7 +97,7 @@ public void Connect(IPEndPoint endPoint)
 
                     ConnectedSessions.TryAdd(Session.Id, Session);
 
-                    ((ISecureSocketSession) Session).SecureSession(Rsa);
+                    ((ISetupSocketSession) Session).StartSession();
                 }
             };
 

diff --git a/src/DtronixMessageQueue/TcpSocket/TcpSocketHandler.cs b/src/DtronixMessageQueue/TcpSocket/TcpSocketHandler.cs
@@ -87,16 +87,6 @@ public abstract class TcpSocketHandler<TSession, TConfig>
         /// </summary>
         protected readonly ServiceMethodCache ServiceMethodCache;
 
-        /// <summary>
-        /// Hold the RSA class for authentication during session setup.
-        /// </summary>
-        protected RSACng Rsa;
-
-        /// <summary>
-        /// Key used for encryption of data to the server side.
-        /// </summary>
-        public byte[] RsaPublicKey { get; set; }
-
         /// <summary>
         /// Base constructor to all socket classes.
         /// </summary>
@@ -139,9 +129,6 @@ protected TcpSocketHandler(TConfig config, TcpSocketMode mode)
                     ThreadName = $"{modeLower}-inbox",
                     StartThreads = processorThreads
                 });
-
-                Rsa = new RSACng(4096);
-                RsaPublicKey = Rsa.ExportParameters(false).Modulus;
             }
 
             OutboxProcessor.Start();

diff --git a/src/DtronixMessageQueue/TcpSocket/TcpSocketServer.cs b/src/DtronixMessageQueue/TcpSocket/TcpSocketServer.cs
@@ -161,7 +161,7 @@ private void AcceptCompleted(SocketAsyncEventArgs e)
                 ConnectedSessions.TryAdd(session.Id, session);
 
                 // Start the session.
-                ((ISecureSocketSession)session).SecureSession(Rsa);
+                ((ISetupSocketSession)session).StartSession();
 
                 session.Connected += (sender, args) => OnConnect(session);
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ public void Connect(IPEndPoint endPoint) @@
                         ConnectedSessions.TryAdd(Session.Id, Session);
-                        ((ISecureSocketSession) Session).SecureSession(Rsa);
+                        ((ISetupSocketSession) Session).StartSession();
                     }
                 };
@@ Expand Down @@