Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print the offset in the hex output #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions DefenderCheck/DefenderCheck/Program.cs
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@ static void Main(string[] args)
Console.WriteLine("[-] Can't access the target file");
return;
}


if (debug) { Console.WriteLine("Scanning the whole file first"); }
string originalFileDetectionStatus = Scan(targetfile).ToString();
if (originalFileDetectionStatus.Equals("NoThreatFound"))
{
if (debug) { Console.WriteLine("Scanning the whole file first"); }
Console.WriteLine("[+] No threat found in submitted file!");
return;
}
@@ -109,7 +109,7 @@ public static byte[] HalfSplitter(byte[] originalarray, int lastgood) //Will rou
{
Buffer.BlockCopy(originalarray, originalarray.Length - 256, offendingBytes, 0, 256);
}
HexDump(offendingBytes, 16);
HexDump(offendingBytes, 16, originalarray.Length - offendingBytes.Length);
File.Delete(@"C:\Temp\testfile.exe");
Environment.Exit(0);
}
@@ -202,7 +202,7 @@ public enum ScanResult
}

//Adapted from https://www.codeproject.com/Articles/36747/Quick-and-Dirty-HexDump-of-a-Byte-Array
public static void HexDump(byte[] bytes, int bytesPerLine = 16)
public static void HexDump(byte[] bytes, int bytesPerLine = 16, int offset = 0)
{
if (bytes == null)
{
@@ -231,14 +231,15 @@ public static void HexDump(byte[] bytes, int bytesPerLine = 16)

for (int i = 0; i < bytesLength; i += bytesPerLine)
{
line[0] = HexChars[(i >> 28) & 0xF];
line[1] = HexChars[(i >> 24) & 0xF];
line[2] = HexChars[(i >> 20) & 0xF];
line[3] = HexChars[(i >> 16) & 0xF];
line[4] = HexChars[(i >> 12) & 0xF];
line[5] = HexChars[(i >> 8) & 0xF];
line[6] = HexChars[(i >> 4) & 0xF];
line[7] = HexChars[(i >> 0) & 0xF];
int address = offset + i;
line[0] = HexChars[(address >> 28) & 0xF];
line[1] = HexChars[(address >> 24) & 0xF];
line[2] = HexChars[(address >> 20) & 0xF];
line[3] = HexChars[(address >> 16) & 0xF];
line[4] = HexChars[(address >> 12) & 0xF];
line[5] = HexChars[(address >> 8) & 0xF];
line[6] = HexChars[(address >> 4) & 0xF];
line[7] = HexChars[(address >> 0) & 0xF];

int hexColumn = firstHexColumn;
int charColumn = firstCharColumn;