diff --git a/BurnOutSharp/ProtectionType/CactusDataShield.cs b/BurnOutSharp/ProtectionType/CactusDataShield.cs index e3d94512..8af6f1ce 100644 --- a/BurnOutSharp/ProtectionType/CactusDataShield.cs +++ b/BurnOutSharp/ProtectionType/CactusDataShield.cs @@ -12,20 +12,6 @@ namespace BurnOutSharp.ProtectionType { public class CactusDataShield : IContentCheck, IPEContentCheck, IPathCheck { - /// - private List GetContentMatchSets() - { - // TODO: Both of these are found in Mac binaries - return new List - { - // CDSPlayer - new ContentMatchSet(new byte?[] { 0x43, 0x44, 0x53, 0x50, 0x6C, 0x61, 0x79, 0x65, 0x72 }, "Cactus Data Shield 200"), - - // yucca.cds - new ContentMatchSet(new byte?[] { 0x79, 0x75, 0x63, 0x63, 0x61, 0x2E, 0x63, 0x64, 0x73 }, "Cactus Data Shield 200"), - }; - } - /// public string CheckContents(string file, byte[] fileContent, bool includeDebug, PortableExecutable pex, NewExecutable nex) { @@ -33,7 +19,15 @@ namespace BurnOutSharp.ProtectionType // TODO: Obtain a sample to find where this string is in a typical executable if (includeDebug) { - var contentMatchSets = GetContentMatchSets(); + var contentMatchSets = new List + { + // CDSPlayer + new ContentMatchSet(new byte?[] { 0x43, 0x44, 0x53, 0x50, 0x6C, 0x61, 0x79, 0x65, 0x72 }, "Cactus Data Shield 200"), + + // yucca.cds + new ContentMatchSet(new byte?[] { 0x79, 0x75, 0x63, 0x63, 0x61, 0x2E, 0x63, 0x64, 0x73 }, "Cactus Data Shield 200"), + }; + if (contentMatchSets != null && contentMatchSets.Any()) return MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, includeDebug); }