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

getFieldToMethodDictionary() is now a non-virtual method

Browse Source
This commit is contained in:
de4dot 2012-07-27 07:57:13 +02:00
parent 4ffa123e7f
commit 3abb8de345
4 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
de4dot.code/deobfuscators/Babel_NET/ProxyCallFixer.cs
View File

@ -95,25 +95,6 @@ namespace de4dot.code.deobfuscators.Babel_NET {
return null;
}
protected override Dictionary<FieldDefinition, MethodDefinition> getFieldToMethodDictionary(TypeDefinition type) {
var dict = new Dictionary<FieldDefinition, MethodDefinition>();
foreach (var method in type.Methods) {
if (!method.IsStatic || !method.HasBody || method.Name == ".cctor")
continue;
var instructions = method.Body.Instructions;
for (int i = 0; i < instructions.Count; i++) {
var instr = instructions[i];
if (instr.OpCode.Code != Code.Ldsfld)
continue;
dict[(FieldDefinition)instr.Operand] = method;
break;
}
}
return dict;
}
protected override void getCallInfo(object context, FieldDefinition field, out MethodReference calledMethod, out OpCode callOpcode) {
var ctx = (Context)context;

19
de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs
View File

@ -73,25 +73,6 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
return null;
}
protected override Dictionary<FieldDefinition, MethodDefinition> getFieldToMethodDictionary(TypeDefinition type) {
var dict = new Dictionary<FieldDefinition, MethodDefinition>();
foreach (var method in type.Methods) {
if (!method.IsStatic || !method.HasBody || method.Name == ".cctor")
continue;
var instructions = method.Body.Instructions;
for (int i = 0; i < instructions.Count; i++) {
var instr = instructions[i];
if (instr.OpCode.Code != Code.Ldsfld)
continue;
dict[(FieldDefinition)instr.Operand] = method;
break;
}
}
return dict;
}
protected override void getCallInfo(object context, FieldDefinition field, out MethodReference calledMethod, out OpCode callOpcode) {
var ctx = (Context)context;

4
de4dot.code/deobfuscators/Goliath_NET/ProxyCallFixer.cs
View File

@ -136,10 +136,6 @@ namespace de4dot.code.deobfuscators.Goliath_NET {
throw new System.NotImplementedException();
}
protected override Dictionary<FieldDefinition, MethodDefinition> getFieldToMethodDictionary(TypeDefinition type) {
throw new NotImplementedException();
}
protected override void getCallInfo(object context, FieldDefinition field, out MethodReference calledMethod, out OpCode callOpcode) {
throw new System.NotImplementedException();
}

23
de4dot.code/deobfuscators/ProxyCallFixerBase.cs
View File

@ -431,9 +431,30 @@ namespace de4dot.code.deobfuscators {
}
protected abstract object checkCctor(TypeDefinition type, MethodDefinition cctor);
protected abstract Dictionary<FieldDefinition, MethodDefinition> getFieldToMethodDictionary(TypeDefinition type);
protected abstract void getCallInfo(object context, FieldDefinition field, out MethodReference calledMethod, out OpCode callOpcode);
Dictionary<FieldDefinition, MethodDefinition> getFieldToMethodDictionary(TypeDefinition type) {
var dict = new Dictionary<FieldDefinition, MethodDefinition>();
foreach (var method in type.Methods) {
if (!method.IsStatic || !method.HasBody || method.Name == ".cctor")
continue;
var instructions = method.Body.Instructions;
for (int i = 0; i < instructions.Count; i++) {
var instr = instructions[i];
if (instr.OpCode.Code != Code.Ldsfld)
continue;
var field = instr.Operand as FieldDefinition;
if (field == null)
continue;
dict[field] = method;
break;
}
}
return dict;
}
protected override bool deobfuscate(Blocks blocks, IList<Block> allBlocks) {
var removeInfos = new Dictionary<Block, List<RemoveInfo>>();