monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MethodBodyReaderBase

Browse Source 
- Change field types to IList<T>
- Add restoreMethod()
- Add readInstructionsNumBytes()
This commit is contained in:
de4dot 2012-08-21 14:59:46 +02:00
parent 353173fcb3
commit 729780c235
3 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
de4dot.code/deobfuscators/Babel_NET/MethodReferenceReader.cs
View File

@ -60,9 +60,9 @@ namespace de4dot.code.deobfuscators.Babel_NET {
public int Flags2 { get; set; }
public short MaxStack { get; set; }
public List<VariableDefinition> Locals { get; set; }
public Instruction[] Instructions { get; set; }
public ExceptionHandler[] ExceptionHandlers { get; set; }
public IList<VariableDefinition> Locals { get; set; }
public IList<Instruction> Instructions { get; set; }
public IList<ExceptionHandler> ExceptionHandlers { get; set; }
public bool IsStatic {
get { return (Flags2 & 0x10) != 0; }

23
de4dot.code/deobfuscators/ILProtector/MethodsDecrypter.cs
View File

@ -241,28 +241,9 @@ namespace de4dot.code.deobfuscators.ILProtector {
}
static void restoreMethod(MethodDefinition method, MethodReader methodReader) {
var body = method.Body;
// body.MaxStackSize = <let Mono.Cecil calculate this>
body.InitLocals = methodReader.InitLocals;
body.Variables.Clear();
if (methodReader.Locals != null) {
foreach (var local in methodReader.Locals)
body.Variables.Add(local);
}
body.Instructions.Clear();
if (methodReader.Instructions != null) {
foreach (var instr in methodReader.Instructions)
body.Instructions.Add(instr);
}
body.ExceptionHandlers.Clear();
if (methodReader.ExceptionHandlers != null) {
foreach (var eh in methodReader.ExceptionHandlers)
body.ExceptionHandlers.Add(eh);
}
method.Body.InitLocals = methodReader.InitLocals;
methodReader.restoreMethod(method);
}
int getMethodId(MethodDefinition method) {

67
de4dot.code/deobfuscators/MethodBodyReaderBase.cs
View File

@ -27,9 +27,9 @@ using de4dot.blocks;
namespace de4dot.code.deobfuscators {
abstract class MethodBodyReaderBase {
protected BinaryReader reader;
public List<VariableDefinition> Locals { get; set; }
public Instruction[] Instructions { get; set; }
public ExceptionHandler[] ExceptionHandlers { get; set; }
public IList<VariableDefinition> Locals { get; set; }
public IList<Instruction> Instructions { get; set; }
public IList<ExceptionHandler> ExceptionHandlers { get; set; }
protected IList<ParameterDefinition> parameters;
int currentOffset;
@ -46,17 +46,34 @@ namespace de4dot.code.deobfuscators {
protected void readInstructions(int numInstrs) {
Instructions = new Instruction[numInstrs];
currentOffset = 0;
for (int i = 0; i < Instructions.Length; i++) {
var instr = readInstruction();
Instructions[i] = instr;
if (instr.OpCode.Code == Code.Switch) {
int[] targets = (int[])instr.Operand;
currentOffset += instr.OpCode.Size + 4 + 4 * targets.Length;
}
else
currentOffset += Instructions[i].GetSize();
}
for (int i = 0; i < Instructions.Count; i++)
Instructions[i] = readOneInstruction();
fixBranches();
}
protected void readInstructionsNumBytes(uint codeSize) {
var instrs = new List<Instruction>();
long endOffs = reader.BaseStream.Position + codeSize;
while (reader.BaseStream.Position < endOffs)
instrs.Add(readOneInstruction());
if (reader.BaseStream.Position != endOffs)
throw new ApplicationException("Could not read all instructions");
Instructions = instrs;
fixBranches();
}
Instruction readOneInstruction() {
var instr = readInstruction();
if (instr.OpCode.Code == Code.Switch) {
int[] targets = (int[])instr.Operand;
currentOffset += instr.OpCode.Size + 4 + 4 * targets.Length;
}
else
currentOffset += instr.GetSize();
return instr;
}
void fixBranches() {
foreach (var instr in Instructions) {
switch (instr.OpCode.OperandType) {
case OperandType.InlineBrTarget:
@ -231,10 +248,32 @@ namespace de4dot.code.deobfuscators {
protected void readExceptionHandlers(int numExceptionHandlers) {
ExceptionHandlers = new ExceptionHandler[numExceptionHandlers];
for (int i = 0; i < ExceptionHandlers.Length; i++)
for (int i = 0; i < ExceptionHandlers.Count; i++)
ExceptionHandlers[i] = readExceptionHandler();
}
protected abstract ExceptionHandler readExceptionHandler();
public void restoreMethod(MethodDefinition method) {
var body = method.Body;
body.Variables.Clear();
if (Locals != null) {
foreach (var local in Locals)
body.Variables.Add(local);
}
body.Instructions.Clear();
if (Instructions != null) {
foreach (var instr in Instructions)
body.Instructions.Add(instr);
}
body.ExceptionHandlers.Clear();
if (ExceptionHandlers != null) {
foreach (var eh in ExceptionHandlers)
body.ExceptionHandlers.Add(eh);
}
}
}
}