diff --git a/BurnOutSharp/FileType/Executable.cs b/BurnOutSharp/FileType/Executable.cs index fd85692b..ab34d1d5 100644 --- a/BurnOutSharp/FileType/Executable.cs +++ b/BurnOutSharp/FileType/Executable.cs @@ -59,6 +59,8 @@ namespace BurnOutSharp.FileType List subProtections = new List(); string protection; + #region Protections + // 3PLock protection = ThreePLock.CheckContents(fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) @@ -79,11 +81,6 @@ namespace BurnOutSharp.FileType if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - // Armadillo - protection = Armadillo.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - // Cactus Data Shield protection = CactusDataShield.CheckContents(fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) @@ -124,11 +121,6 @@ namespace BurnOutSharp.FileType if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - // dotFuscator - protection = dotFuscator.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - // DVD-Cops protection = DVDCops.CheckContents(fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) @@ -139,11 +131,6 @@ namespace BurnOutSharp.FileType if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - // EXE Stealth - protection = EXEStealth.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - // Games for Windows - Live protection = GFWL.CheckContents(fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) @@ -173,16 +160,6 @@ namespace BurnOutSharp.FileType protection = LaserLock.CheckContents(file, fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - - // NSIS - protection = NSIS.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - - // PE Compact - protection = PECompact.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); // ProtectDisc protection = ProtectDisc.CheckContents(file, fileContent, includePosition); @@ -239,11 +216,6 @@ namespace BurnOutSharp.FileType if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); - // UPX - protection = UPX.CheckContents(fileContent, includePosition); - if (!string.IsNullOrWhiteSpace(protection)) - protections.Add(protection); - // VOB ProtectCD/DVD protection = VOBProtectCDDVD.CheckContents(file, fileContent, includePosition); if (!string.IsNullOrWhiteSpace(protection)) @@ -269,6 +241,43 @@ namespace BurnOutSharp.FileType if (!string.IsNullOrWhiteSpace(protection)) protections.Add(protection); + #endregion + + // These are detected as protections until we can unpack them + #region Packers + + // Armadillo + protection = Armadillo.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + // dotFuscator + protection = dotFuscator.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + // EXE Stealth + protection = EXEStealth.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + // NSIS + protection = NSIS.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + // PE Compact + protection = PECompact.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + // UPX + protection = UPX.CheckContents(fileContent, includePosition); + if (!string.IsNullOrWhiteSpace(protection)) + protections.Add(protection); + + #endregion + return protections; } }