Remove BouncyCastle, JsonFx.Json, MarkerMetro and crypto DLLs. (#56)

* Remove BouncyCastle, JsonFx.Json, MarkerMetro and crypto DLLs. Features works without the need of these libs.

* PubNub SDK v6.0.1 release.

* Update PlayModeCommon.cs

Co-authored-by: Client Engineering Bot <Client Engineering [email protected]>

Author: crimsonred

.gitignore

@@ -67,3 +67,4 @@ Thumbs.db
 
 unity_installer_cache
 logs
+.vscode

.pubnub.yml

@@ -1,6 +1,11 @@
 --- 
-version: v6.0.0
+version: v6.0.1
 changelog:
+  - date: 2021-11-30
+    version: v6.0.1
+    changes:
+      - type: improvement
+        text: "Remove BouncyCastle, JsonFx.Json, MarkerMetro and crypto DLLs. Features works without the need of these libs."
   -
     changes:
       -

PubNubUnity/Assets/PubNub/Crypto/MD5.cs

@@ -3,13 +3,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Globalization;
-#if UNITY_WSA || UNITY_WSA_8_1 || UNITY_WSA_10_0
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Security;
-#else
 using System.Security.Cryptography;
-#endif
 
 namespace PubNubAPI
 {
@@ -676,27 +670,6 @@ protected string EncodeNonAsciiCharacters (string value)
             return sb.ToString ();
         }
 
-        #if UNITY_WSA || UNITY_WSA_8_1 || UNITY_WSA_10_0
-        public string PubnubAccessManagerSign(string key, string data)
-        {
-            string secret = key;
-            string message = data;
-
-            var encoding = new System.Text.UTF8Encoding();
-            byte[] keyByte = encoding.GetBytes(secret);
-            byte[] messageBytes = encoding.GetBytes(message);
-
-            //http://mycsharp.de/wbb2/thread.php?postid=3550104
-            KeyParameter paramKey = new KeyParameter(keyByte);
-            IMac mac = MacUtilities.GetMac("HMac-SHA256");
-            mac.Init(paramKey);
-            mac.Reset();
-            mac.BlockUpdate(messageBytes, 0, messageBytes.Length);
-            byte[] hashmessage = new byte[mac.GetMacSize()];
-            mac.DoFinal(hashmessage, 0);
-            return Convert.ToBase64String(hashmessage).Replace('+', '-').Replace('/', '_');
-        }
-        #else
         public string PubnubAccessManagerSign (string key, string data)
         {
             string secret = key;
@@ -711,7 +684,6 @@ public string PubnubAccessManagerSign (string key, string data)
                 return Convert.ToBase64String (hashmessage).Replace ('+', '-').Replace ('/', '_');
             }
         }
-        #endif
     }
     #endregion
 }

PubNubUnity/Assets/PubNub/Crypto/PubnubCrypto.cs

@@ -1,16 +1,6 @@
 using System;
 using System.Text;
-
-#if UNITY_WSA || UNITY_WSA_8_1 || UNITY_WSA_10_0
-using Org.BouncyCastle.Crypto.Digests;
-using Org.BouncyCastle.Crypto.Engines;
-using Org.BouncyCastle.Crypto.Modes;
-using Org.BouncyCastle.Crypto.Paddings;
-using Org.BouncyCastle.Crypto.Parameters;
-using Org.BouncyCastle.Security;
-#endif
 using System.Security.Cryptography;
-
 using System.IO;
 
 namespace PubNubAPI
@@ -111,110 +101,7 @@ public bool EncryptOrDecryptFile(bool encrypt, byte[] iv, string filePath, strin
 
             return true;
         }
-                
-        #if UNITY_WSA || UNITY_WSA_8_1 || UNITY_WSA_10_0
-        public override string ComputeHashRaw(string input)
-        {
-            Sha256Digest algorithm = new Sha256Digest();
-            Byte[] inputBytes = System.Text.Encoding.UTF8.GetBytes(input);
-            Byte[] bufferBytes = new byte[algorithm.GetDigestSize()];
-            algorithm.BlockUpdate(inputBytes, 0, inputBytes.Length);
-            algorithm.DoFinal(bufferBytes, 0);
-            return BitConverter.ToString(bufferBytes);
-        }
-
-        protected override string EncryptOrDecrypt(bool type, string plainStr)
-        {
-            //Demo params
-            string keyString = GetEncryptionKey();
-
-            string input = plainStr;
-            byte[] inputBytes;            
-            byte[] keyBytes = System.Text.Encoding.UTF8.GetBytes(keyString);
-
-            //Set up
-            AesEngine engine = new AesEngine();
-            CbcBlockCipher blockCipher = new CbcBlockCipher(engine); //CBC
-            PaddedBufferedBlockCipher cipher = new PaddedBufferedBlockCipher(blockCipher); //Default scheme is PKCS5/PKCS7
-            KeyParameter keyParam = new KeyParameter(keyBytes);            
-
-            if (type)
-            {
-                // Encrypt
-                byte[] iv = new byte[16];
-                if(UseRandomInitializationVector){
-                    // Generate IV here
-                    iv = new byte[16]; 
-                    SecureRandom sr = new SecureRandom();
-                    sr.NextBytes(iv);
-                    
-                    
-                } else {
-                    iv = System.Text.Encoding.ASCII.GetBytes("0123456789012345");
-                }
-                
-                ParametersWithIV keyParamWithIV = new ParametersWithIV(keyParam, iv, 0, iv.Length);
-                
-                input = EncodeNonAsciiCharacters(input);
-                inputBytes = Encoding.UTF8.GetBytes(input);
-                cipher.Init(true, keyParamWithIV);
-                byte[] outputBytes = new byte[cipher.GetOutputSize(inputBytes.Length)];
-                int length = cipher.ProcessBytes(inputBytes, outputBytes, 0);
-                cipher.DoFinal(outputBytes, length); //Do the final block
-
-                if(UseRandomInitializationVector){
-                    // Add IV
-                    byte[] message = new byte[outputBytes.Length + iv.Length];
-                    System.Buffer.BlockCopy(iv, 0, message, 0, iv.Length);
-                    System.Buffer.BlockCopy(outputBytes, 0, message, iv.Length, outputBytes.Length);
-                    outputBytes = new byte[message.Length];
-                    System.Buffer.BlockCopy(message, 0, outputBytes, 0, message.Length);
-                }
 
-                return Convert.ToBase64String(outputBytes);
-            }
-            else
-            {
-                try
-                {
-                    //Decrypt
-                    
-                    inputBytes = Convert.FromBase64CharArray(input.ToCharArray(), 0, input.Length);
-                    byte[] iv = new byte[16];
-
-                    if(UseRandomInitializationVector){
-                        // Extract IV here
-                        System.Buffer.BlockCopy(inputBytes, 0, iv, 0, 16);
-                        byte[] message = new byte[inputBytes.Length - 16];
-                        System.Buffer.BlockCopy(inputBytes, 16, message, 0, inputBytes.Length-16);
-                        inputBytes = new byte[message.Length];
-                        System.Buffer.BlockCopy(message, 0, inputBytes, 0, message.Length);
-
-                    } else {
-                        iv = System.Text.Encoding.ASCII.GetBytes("0123456789012345");
-                    }
-
-                    ParametersWithIV keyParamWithIV = new ParametersWithIV(keyParam, iv, 0, iv.Length);
-                    
-                    cipher.Init(false, keyParamWithIV);
-                    byte[] encryptedBytes = new byte[cipher.GetOutputSize(inputBytes.Length)];
-                    int encryptLength = cipher.ProcessBytes(inputBytes, encryptedBytes, 0);
-                    int numOfOutputBytes = cipher.DoFinal(encryptedBytes, encryptLength); //Do the final block
-                    int len = Array.IndexOf(encryptedBytes, (byte)0);
-                    len = (len == -1) ? encryptedBytes.Length : len;
-                    return Encoding.UTF8.GetString(encryptedBytes, 0, len);
-
-                }
-                catch (Exception ex)
-                {
-                    #if (ENABLE_PUBNUB_LOGGING)
-                    pnLog.WriteToLog(string.Format("Decrypt Error. {0}", ex.ToString()), PNLoggingMethod.LevelVerbose);
-                    #endif
-                    throw ex;
-                }
-            }
-        }
-        #else
         public override string ComputeHashRaw (string input)
         {
         #if (SILVERLIGHT || WINDOWS_PHONE || MONOTOUCH || __IOS__ || MONODROID || __ANDROID__ || UNITY_STANDALONE || UNITY_WEBPLAYER || UNITY_IOS || UNITY_ANDROID || UNITY_5 || UNITY_WEBGL)
@@ -299,9 +186,6 @@ protected override string EncryptOrDecrypt (bool type, string plainStr)
                 }
             }
         }
-
-        #endif
-
     }
     #endregion
 }

PubNubUnity/Assets/PubNub/PlayModeTests/PlayModeCommon.cs

@@ -8,6 +8,7 @@
 namespace PubNubAPI.Tests
 {
 
+#if !UNITY_WSA && !UNITY_WSA_10_0
     class PubnubDemoObject
     {
         public double VersionID {get; set;} 
@@ -109,4 +110,5 @@ public static PNConfiguration SetPNConfig(bool useCipher, bool withPAM){
 
 
     }
-}
+#endif    
+}

PubNubUnity/Assets/PubNub/PlayModeTests/PlayModeTests.cs

@@ -1,12 +1,13 @@
-using UnityEngine;
+#if !UNITY_WSA && !UNITY_WSA_10_0
+using UnityEngine;
 using UnityEngine.TestTools;
-using NUnit.Framework;
 using System.Collections;
 using System.Collections.Generic;
 using System;
 using System.Text;
 using System.IO;
 using System.Linq;
+using NUnit.Framework;
 
 namespace PubNubAPI.Tests
 {
@@ -5917,3 +5918,4 @@ public IEnumerator TestGrantToken() {
 
 	}
 }
+#endif

PubNubUnity/Assets/PubNub/PubNubUnity/PubNubUnityBase.cs

@@ -7,7 +7,7 @@ namespace PubNubAPI
     public class PubNubUnityBase
     {
         protected Counter publishMessageCounter;
-        private const string build = "6.0.0";
+        private const string build = "6.0.1";
         private string pnsdkVersion = string.Format ("PubNub-CSharp-Unity/{0}", build);
 
         public string Version {