Fixed Encrypt & Decrypt for clients

TwoTenPvP · TwoTenPvP · commit 43859d181c3f · 2018-07-26T15:34:20.000+02:00
diff --git a/MLAPI/NetworkingManagerComponents/Cryptography/CryptographyHelper.cs b/MLAPI/NetworkingManagerComponents/Cryptography/CryptographyHelper.cs
@@ -24,7 +24,7 @@ public static Stream DecryptStream(Stream encryptedStream, uint clientId)
             using (RijndaelManaged aes = new RijndaelManaged())
             {
                 aes.IV = IVBuffer;
-                aes.Key = NetworkingManager.singleton.ConnectedClients[clientId].AesKey;
+                aes.Key = NetworkingManager.singleton.isServer ? NetworkingManager.singleton.ConnectedClients[clientId].AesKey : NetworkingManager.singleton.clientAesKey;
                 using (CryptoStream cs = new CryptoStream(encryptedStream, aes.CreateDecryptor(), CryptoStreamMode.Read))
                 {
                     using (PooledBitStream outStream = PooledBitStream.Get())
@@ -46,7 +46,7 @@ public static Stream EncryptStream(Stream clearStream, uint clientId)
         {
             using (RijndaelManaged aes = new RijndaelManaged())
             {
-                aes.Key = NetworkingManager.singleton.ConnectedClients[clientId].AesKey;;
+                aes.Key = NetworkingManager.singleton.isServer ? NetworkingManager.singleton.ConnectedClients[clientId].AesKey : NetworkingManager.singleton.clientAesKey;
                 aes.GenerateIV();
                 
                 using (CryptoStream cs = new CryptoStream(clearStream, aes.CreateEncryptor(), CryptoStreamMode.Read))

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static Stream DecryptStream(Stream encryptedStream, uint clientId)`
`24`	`24`	`using (RijndaelManaged aes = new RijndaelManaged())`
`25`	`25`	`{`
`26`	`26`	`aes.IV = IVBuffer;`
`27`		`- aes.Key = NetworkingManager.singleton.ConnectedClients[clientId].AesKey;`
	`27`	`+ aes.Key = NetworkingManager.singleton.isServer ? NetworkingManager.singleton.ConnectedClients[clientId].AesKey : NetworkingManager.singleton.clientAesKey;`
`28`	`28`	`using (CryptoStream cs = new CryptoStream(encryptedStream, aes.CreateDecryptor(), CryptoStreamMode.Read))`
`29`	`29`	`{`
`30`	`30`	`using (PooledBitStream outStream = PooledBitStream.Get())`
`@@ -46,7 +46,7 @@ public static Stream EncryptStream(Stream clearStream, uint clientId)`
`46`	`46`	`{`
`47`	`47`	`using (RijndaelManaged aes = new RijndaelManaged())`
`48`	`48`	`{`
`49`		`- aes.Key = NetworkingManager.singleton.ConnectedClients[clientId].AesKey;;`
	`49`	`+ aes.Key = NetworkingManager.singleton.isServer ? NetworkingManager.singleton.ConnectedClients[clientId].AesKey : NetworkingManager.singleton.clientAesKey;`
`50`	`50`	`aes.GenerateIV();`
`51`	`51`
`52`	`52`	`using (CryptoStream cs = new CryptoStream(clearStream, aes.CreateEncryptor(), CryptoStreamMode.Read))`