Changed how input streams are named

BinderTool.Core/Bhd5/Bhd5AesKey.cs

@@ -13,6 +13,7 @@ public static Bhd5AesKey Read(Stream inputStream)
             BinaryReader reader = new BinaryReader(inputStream, Encoding.UTF8, true);
 
             result.Key = reader.ReadBytes(16);
+            // TODO: Check if this is a 128bit hash 
             uint unknown1 = reader.ReadUInt32();
             uint unknown2 = reader.ReadUInt32();
             uint unknown3 = reader.ReadUInt32();

BinderTool.Core/IO/BigEndianBinaryReader.cs

@@ -8,15 +8,15 @@ internal class BigEndianBinaryReader : BinaryReader
     {
         private const byte DecimalSignBit = 128;
 
-        public BigEndianBinaryReader(Stream input) : base(input)
+        public BigEndianBinaryReader(Stream inputStream) : base(inputStream)
         {
         }
 
-        public BigEndianBinaryReader(Stream input, Encoding encoding) : base(input, encoding)
+        public BigEndianBinaryReader(Stream inputStream, Encoding encoding) : base(inputStream, encoding)
         {
         }
 
-        public BigEndianBinaryReader(Stream input, Encoding encoding, bool leaveOpen) : base(input, encoding, leaveOpen)
+        public BigEndianBinaryReader(Stream inputStream, Encoding encoding, bool leaveOpen) : base(inputStream, encoding, leaveOpen)
         {
         }
 

BinderTool.Core/Regulation/RegulationFile.cs

@@ -39,9 +39,9 @@ public static RegulationFile ReadRegulationFile(Stream inputStream)
             return regulationFile;
         }
 
-        private void Read(Stream input)
+        private void Read(Stream inputStream)
         {
-            BigEndianBinaryReader reader = new BigEndianBinaryReader(input, Encoding.UTF8, true);
+            BigEndianBinaryReader reader = new BigEndianBinaryReader(inputStream, Encoding.UTF8, true);
 
             _iv[00] = 0x80;
             for (int i = 1; i <= 11; i++)
@@ -53,8 +53,8 @@ private void Read(Stream input)
             _iv[14] = 0x00;
             _iv[15] = 0x01;
 
-            input.Seek(RegulationHeaderSize, SeekOrigin.Begin);
-            EncryptedData = reader.ReadBytes((int) input.Length - RegulationHeaderSize);
+            inputStream.Seek(RegulationHeaderSize, SeekOrigin.Begin);
+            EncryptedData = reader.ReadBytes((int) inputStream.Length - RegulationHeaderSize);
         }
     }
 }

BinderTool.Core/Sl2/Sl2UserData.cs

@@ -28,6 +28,7 @@ public byte[] DecryptedUserData
         {
             get
             {
+                // TODO: Check if the first 128bit are a hash
                 return CryptographyUtility.DecryptAesCbc(new MemoryStream(EncryptedUserData), UserDataKey, _iv).ToArray();
             }
         }

BinderTool/Program.cs

@@ -289,15 +289,15 @@ private static bool TryGetFileExtension(string signature, out string extension)
 
         private static void UnpackBndFile(string path, string outputPath)
         {
-            using (FileStream input = new FileStream(path, FileMode.Open))
+            using (FileStream inputStream = new FileStream(path, FileMode.Open))
             {
-                UnpackBndFile(input, outputPath);
+                UnpackBndFile(inputStream, outputPath);
             }
         }
 
-        private static void UnpackBndFile(Stream input, string outputPath)
+        private static void UnpackBndFile(Stream inputStream, string outputPath)
         {
-            Bnd4File file = Bnd4File.ReadBnd4File(input);
+            Bnd4File file = Bnd4File.ReadBnd4File(inputStream);
 
             foreach (var entry in file.Entries)
             {
@@ -308,9 +308,9 @@ private static void UnpackBndFile(Stream input, string outputPath)
 
         private static void UnpackSl2File(string path, string outputPath)
         {
-            using (FileStream input = new FileStream(path, FileMode.Open))
+            using (FileStream inputStream = new FileStream(path, FileMode.Open))
             {
-                Sl2File sl2File = Sl2File.ReadSl2File(input);
+                Sl2File sl2File = Sl2File.ReadSl2File(inputStream);
                 foreach (var userData in sl2File.UserData)
                 {
                     string outputFilePath = Path.Combine(outputPath, userData.UserDataName);
@@ -321,9 +321,9 @@ private static void UnpackSl2File(string path, string outputPath)
 
         private static void UnpackRegulationFile(string path, string outputPath)
         {
-            using (FileStream input = new FileStream(path, FileMode.Open))
+            using (FileStream inputStream = new FileStream(path, FileMode.Open))
             {
-                RegulationFile encryptedRegulationFile = RegulationFile.ReadRegulationFile(input);
+                RegulationFile encryptedRegulationFile = RegulationFile.ReadRegulationFile(inputStream);
                 DcxFile compressedRegulationFile = DcxFile.Read(new MemoryStream(encryptedRegulationFile.DecryptedData));
                 UnpackBndFile(new MemoryStream(compressedRegulationFile.DecompressedData), outputPath);
             }
@@ -335,9 +335,9 @@ private static void UnpackDcxFile(string dcxPath, string outputPath)
             string unpackedFilePath = Path.Combine(outputPath, unpackedFileName);
 
             Directory.CreateDirectory(outputPath);
-            using (FileStream input = new FileStream(dcxPath, FileMode.Open))
+            using (FileStream inputStream = new FileStream(dcxPath, FileMode.Open))
             {
-                DcxFile dcxFile = DcxFile.Read(input);
+                DcxFile dcxFile = DcxFile.Read(inputStream);
                 File.WriteAllBytes(unpackedFilePath, dcxFile.DecompressedData);
             }
         }
@@ -362,12 +362,12 @@ private static void UnpackBdf4File(string bdfPath, string outputPath)
                 }
             }
 
-            using (FileStream bhf4Input = new FileStream(bhf4FilePath, FileMode.Open))
-            using (FileStream bdf4Input = new FileStream(bdfPath, FileMode.Open))
+            using (FileStream bhf4InputStream = new FileStream(bhf4FilePath, FileMode.Open))
+            using (FileStream bdf4InputStream = new FileStream(bdfPath, FileMode.Open))
             {
-                Bhf4File bhf4File = Bhf4File.ReadBhf4File(bhf4Input);
-                Bdf4File bdf4File = Bdf4File.ReadBdf4File(bdf4Input);
-                foreach (var file in bdf4File.ReadData(bdf4Input, bhf4File))
+                Bhf4File bhf4File = Bhf4File.ReadBhf4File(bhf4InputStream);
+                Bdf4File bdf4File = Bdf4File.ReadBdf4File(bdf4InputStream);
+                foreach (var file in bdf4File.ReadData(bdf4InputStream, bhf4File))
                 {
                     ExportFile(file, outputPath);
                 }