1.0.2

Author: Random06457

Bcat Manager/Bcat Manager/AesCrypto.cs

@@ -10,109 +10,43 @@ namespace Bcat_Manager
 {
     public class AesCrypto
     {
-        public static byte[] EncryptAesBlock(byte[] Block, byte[] key)
-        {
-            byte[] decryptedBuffer = new byte[0x10];
-
-            Aes aes = Aes.Create();
-            aes.Mode = CipherMode.ECB;
-            aes.BlockSize = 128;
-            aes.KeySize = key.Length * 8;
-            aes.Key = key;
-
-            int transed = 0;
-            using (var transform = aes.CreateEncryptor())
-            {
-                for (int i = 0; i < 0x10; i += transed)
-                {
-                    transed = transform.TransformBlock(Block, i, 0x10, decryptedBuffer, i);
-                }
-            }
-
-            return decryptedBuffer;
-        }
-        //todo : remove or update
-        public static void EncryptAesBlock(Stream inStream, Stream ouStream, byte[] key)
+        public static byte[] PerformAesCTR(byte[] SourceBuffer, int Offset, int Size, byte[] key, byte[] iv)
         {
-            BinaryReader br = new BinaryReader(inStream);
-            BinaryWriter bw = new BinaryWriter(ouStream);
-
-            byte[] decryptedBuffer = new byte[0x10];
+            byte[] encCounter = new byte[0x10];
+            byte[] decryptedBuffer = new byte[Size];
+            byte[] ctr = iv;
 
             Aes aes = Aes.Create();
             aes.Mode = CipherMode.ECB;
             aes.BlockSize = 128;
             aes.KeySize = key.Length * 8;
             aes.Key = key;
 
-            int transed = 0;
-            using (var transform = aes.CreateEncryptor())
-            {
-                byte[] inBlock = br.ReadBytes(0x10);
-                byte[] outBlock = new byte[0x10];
-
-                for (int i = 0; i < 0x10; i += transed)
-                {
-                    transed = transform.TransformBlock(inBlock, i, 0x10, outBlock, i);
-                }
-
-                bw.Write(outBlock);
-            }
-        }
-
-        //todo : optimise the code to be faster
-        public static void PerformAesCtr(Stream inStream, Stream ouStream, int Size, byte[] key, byte[] iv)
-        {
-            BinaryReader br = new BinaryReader(inStream);
-            BinaryWriter bw = new BinaryWriter(ouStream);
-
-            for (var i = inStream.Position; i < Size; i += 0x10)
-            {
-                byte[] encCounter = EncryptAesBlock(iv, key);
-
-                var rest = Size - i;
-                if (rest > 0x10) rest = 0x10;
-
-                //xor encrypted counter with ciphertext
-                for (int j = 0; j < rest; j++)
-                {
-                    bw.BaseStream.Position = i + j;
-                    br.BaseStream.Position = i + j;
-                    bw.Write(br.ReadByte() ^ encCounter[j]);
-                }
-
-                //increment counter
-                for (var j = iv.Length - 1; j >= 0; j--)
-                {
-                    if (++iv[j] != 0)
-                        break;
-                }
-            }
-        }
-        public static byte[] PerformAesCTR(byte[] SourceBuffer, int Offset, int Size, byte[] key, byte[] iv)
-        {
-            byte[] decryptedBuffer = new byte[Size];
-
-            byte[] counter = iv;
-
             for (int i = Offset; i < Size; i += 0x10)
             {
-                byte[] encCounter = EncryptAesBlock(counter, key);
-
-                int rest = Size - i;
-                if (rest > 0x10) rest = 0x10;
-
-                //xor encrypted counter with ciphertext
-                for (int j = 0; j < rest; j++)
+                using (var transform = aes.CreateEncryptor())
                 {
-                    decryptedBuffer[i + j] = (byte)(encCounter[j] ^ SourceBuffer[i + j]);
-                }
 
-                //increment counter
-                for (var j = counter.Length - 1; j >= 0; j--)
-                {
-                    if (++counter[j] != 0)
-                        break;
+                    int transed = 0;
+                    for (int j = 0; j < 0x10; j += transed)
+                    {
+                        transed = transform.TransformBlock(ctr, j, 0x10, encCounter, j);
+                    }
+
+                    int rest = Size - i;
+                    if (rest > 0x10) rest = 0x10;
+
+                    //xor encrypted counter with ciphertext
+                    for (int j = 0; j < rest; j++)
+                    {
+                        decryptedBuffer[i + j] = (byte)(encCounter[j] ^ SourceBuffer[i + j]);
+                    }
+                    //increment counter
+                    for (var j = ctr.Length - 1; j >= 0; j--)
+                    {
+                        if (++ctr[j] != 0)
+                            break;
+                    }
                 }
             }
 

Bcat Manager/Bcat Manager/App.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+    <configSections>
+    </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
@@ -9,6 +11,10 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>