Fixed DISABLE_CRYPTOGRAPHY conditional

Author: TwoTenPvP

MLAPI/Data/PendingClient.cs

@@ -1,13 +1,17 @@
-using MLAPI.Cryptography;
+#if !DISABLE_CRYPTOGRAPHY
+using MLAPI.Cryptography;
+#endif
 
 namespace MLAPI.Data
 {
     public class PendingClient
     {
         public uint ClientId;
-
+        
+#if !DISABLE_CRYPTOGRAPHY
         internal EllipticDiffieHellman KeyExchange;
-
+#endif
+        
         public byte[] AesKey;
 
         public State ConnectionState;

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -10,7 +10,9 @@
 using System.IO;
 using MLAPI.Components;
 using MLAPI.Configuration;
+#if !DISABLE_CRYPTOGRAPHY
 using MLAPI.Cryptography;
+#endif
 using MLAPI.Internal;
 using MLAPI.Profiling;
 using MLAPI.Serialization;
@@ -637,6 +639,7 @@ private void Update()
                                 if (isServer)
                                 {
                                     if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Client Connected");
+#if !DISABLE_CRYPTOGRAPHY
                                     if (NetworkConfig.EnableEncryption)
                                     {
                                         // This client is required to complete the crypto-hail exchange.
@@ -687,12 +690,15 @@ private void Update()
                                     }
                                     else
                                     {
+#endif
                                         PendingClients.Add(clientId, new PendingClient()
                                         {
                                             ClientId = clientId,
                                             ConnectionState = PendingClient.State.PendingConnection
                                         });
+#if !DISABLE_CRYPTOGRAPHY
                                     }
+#endif
                                     StartCoroutine(ApprovalTimeout(clientId));
                                 }
                                 else
@@ -889,6 +895,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId, int t
                         case MLAPIConstants.MLAPI_CUSTOM_MESSAGE:
                             InternalMessageHandler.HandleCustomMessage(clientId, messageStream, channelId);
                             break;
+#if !DISABLE_CRYPTOGRAPHY
                         case MLAPIConstants.MLAPI_CERTIFICATE_HAIL:
                             if (isClient) InternalMessageHandler.HandleHailRequest(clientId, messageStream, channelId);
                             break;
@@ -898,12 +905,13 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId, int t
                         case MLAPIConstants.MLAPI_GREETINGS:
                             if (isClient) InternalMessageHandler.HandleGreetings(clientId, messageStream, channelId);
                             break;
-                        default:
-                            if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Read unrecognized messageType " + messageType);
-                            break;
+    #endif
                         case MLAPIConstants.MLAPI_CLIENT_SWITCH_SCENE_COMPLETED:
                             if (isServer) InternalMessageHandler.HandleClientSwitchSceneCompleted(clientId, messageStream, channelId);
                             break;
+                        default:
+                            if (LogHelper.CurrentLogLevel <= LogLevel.Error) LogHelper.LogError("Read unrecognized messageType " + messageType);
+                            break;
                     }
 
                     #endregion

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

@@ -3,7 +3,9 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using MLAPI.Components;
+#if !DISABLE_CRYPTOGRAPHY
 using MLAPI.Cryptography;
+#endif
 using MLAPI.Data;
 using MLAPI.Logging;
 using MLAPI.Serialization;
@@ -13,6 +15,7 @@ namespace MLAPI.Internal
 {
     internal static partial class InternalMessageHandler
     {
+#if !DISABLE_CRYPTOGRAPHY
         // Runs on client
         internal static void HandleHailRequest(uint clientId, Stream stream, int channelId)
         {
@@ -172,6 +175,7 @@ internal static void HandleGreetings(uint clientId, Stream stream, int channelId
             // Server greeted us, we can now initiate our request to connect.
             NetworkingManager.singleton.SendConnectionRequest();
         }
+#endif
 
         internal static void HandleConnectionRequest(uint clientId, Stream stream, int channelId)
         {

MLAPI/NetworkingManagerComponents/Core/MessageManager.cs

@@ -1,10 +1,14 @@
-using MLAPI.Cryptography;
+#if !DISABLE_CRYPTOGRAPHY
+using MLAPI.Cryptography;
+#endif
 using MLAPI.Data;
 using MLAPI.Logging;
 using MLAPI.Serialization;
 using System;
 using System.Collections.Generic;
+#if !DISABLE_CRYPTOGRAPHY
 using System.Security.Cryptography;
+#endif
 
 namespace MLAPI.Internal
 {
@@ -28,6 +32,7 @@ internal static BitStream UnwrapMessage(BitStream inputStream, uint clientId, ou
                     bool isEncrypted = inputHeaderReader.ReadBit();
                     bool isAuthenticated = inputHeaderReader.ReadBit();
 
+#if !DISABLE_CRYPTOGRAPHY
                     if (isEncrypted || isAuthenticated)
                     {
                         if (!NetworkingManager.singleton.NetworkConfig.EnableEncryption)
@@ -124,10 +129,13 @@ internal static BitStream UnwrapMessage(BitStream inputStream, uint clientId, ou
                     }
                     else
                     {
+#endif
                         messageType = inputHeaderReader.ReadByteBits(6);
                         // The input stream is now ready to be read from. It's "safe" and has the correct position
                         return inputStream;
+#if !DISABLE_CRYPTOGRAPHY
                     }
+#endif
                 }
                 catch (Exception e)
                 {
@@ -153,7 +161,8 @@ internal static BitStream WrapMessage(byte messageType, uint clientId, BitStream
                 {
                     outWriter.WriteBit(encrypted);
                     outWriter.WriteBit(authenticated);
-
+                    
+#if !DISABLE_CRYPTOGRAPHY
                     if (authenticated || encrypted)
                     {
                         outWriter.WritePadBits();
@@ -214,9 +223,12 @@ internal static BitStream WrapMessage(byte messageType, uint clientId, BitStream
                     }
                     else
                     {
+#endif
                         outWriter.WriteBits(messageType, 6);
                         outStream.Write(messageBody.GetBuffer(), 0, (int)messageBody.Length);
+#if !DISABLE_CRYPTOGRAPHY
                     }
+#endif
                 }
 
                 return outStream;