Inline some obfuscated methods

This commit is contained in:
de4dot 2012-05-02 10:48:44 +02:00
parent db14e73369
commit e8049c6a05
7 changed files with 419 additions and 217 deletions

View File

@ -117,6 +117,7 @@
<Compile Include="deobfuscators\CryptoObfuscator\StringDecrypter.cs" />
<Compile Include="deobfuscators\CryptoObfuscator\TamperDetection.cs" />
<Compile Include="deobfuscators\DeepSea\ArrayBlockDeobfuscator.cs" />
<Compile Include="deobfuscators\DeepSea\DsConstantsReader.cs" />
<Compile Include="deobfuscators\DeepSea\FieldsRestorer.cs" />
<Compile Include="deobfuscators\DeobfuscatorBase.cs" />
<Compile Include="deobfuscators\DeobfuscatorInfoBase.cs" />
@ -127,7 +128,7 @@
<Compile Include="deobfuscators\DeepSea\ResourceResolver.cs" />
<Compile Include="deobfuscators\DeepSea\StringDecrypter.cs" />
<Compile Include="deobfuscators\DeepSea\Deobfuscator.cs" />
<Compile Include="deobfuscators\DeepSea\MethodCallInliner.cs" />
<Compile Include="deobfuscators\DeepSea\DsMethodCallInliner.cs" />
<Compile Include="deobfuscators\Dotfuscator\Deobfuscator.cs" />
<Compile Include="deobfuscators\Dotfuscator\StringDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\AntiStrongName.cs" />

View File

@ -29,7 +29,7 @@ namespace de4dot.code.deobfuscators.DeepSea {
ModuleDefinition module;
FieldDefinitionAndDeclaringTypeDict<FieldInfo> fieldToInfo = new FieldDefinitionAndDeclaringTypeDict<FieldInfo>();
Dictionary<VariableDefinition, FieldInfo> localToInfo = new Dictionary<VariableDefinition, FieldInfo>();
ConstantsReader constantsReader;
DsConstantsReader constantsReader;
class FieldInfo {
public FieldDefinition field;
@ -200,7 +200,7 @@ namespace de4dot.code.deobfuscators.DeepSea {
bool deobfuscate3(Block block, int i) {
var instrs = block.Instructions;
if (i >= instrs.Count)
if (i + 1 >= instrs.Count)
return false;
int start = i;
@ -211,9 +211,12 @@ namespace de4dot.code.deobfuscators.DeepSea {
if (info == null)
return false;
if (!instrs[i + 1].isLdcI4())
return false;
var constants = getConstantsReader(block);
int value;
i++;
i += 2;
if (!constants.getInt32(ref i, out value))
return false;
@ -227,10 +230,10 @@ namespace de4dot.code.deobfuscators.DeepSea {
return true;
}
ConstantsReader getConstantsReader(Block block) {
DsConstantsReader getConstantsReader(Block block) {
if (constantsReader != null)
return constantsReader;
return constantsReader = new ConstantsReader(blocks.Locals, block.Instructions);
return constantsReader = new DsConstantsReader(block.Instructions);
}
}
}

View File

@ -110,7 +110,7 @@ namespace de4dot.code.deobfuscators.DeepSea {
get {
var list = new List<IBlocksDeobfuscator>();
if (CanInlineMethods) {
list.Add(new MethodCallInliner());
list.Add(new DsMethodCallInliner());
if (arrayBlockDeobfuscator.Detected)
list.Add(arrayBlockDeobfuscator);
}
@ -175,7 +175,7 @@ namespace de4dot.code.deobfuscators.DeepSea {
continue;
if (checkedMethods++ >= 1000)
goto done;
if (!DeepSea.MethodCallInliner.canInline(method))
if (!DeepSea.DsMethodCallInliner.canInline(method))
continue;
foundProxies++;
}

View File

@ -0,0 +1,40 @@
/*
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
de4dot is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
de4dot is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with de4dot. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Collections.Generic;
using Mono.Cecil.Cil;
using de4dot.blocks;
namespace de4dot.code.deobfuscators.DeepSea {
class DsConstantsReader : ConstantsReader {
public DsConstantsReader(List<Instr> instrs)
: base(instrs) {
}
protected override bool getLocalConstant(Instruction instr, out int value) {
value = 0;
return true;
}
protected override bool getArgConstant(Instruction instr, out int value) {
value = 0;
return true;
}
}
}

View File

@ -27,7 +27,7 @@ namespace de4dot.code.deobfuscators.DeepSea {
foreach (var type in module.GetTypes()) {
foreach (var method in type.Methods) {
if (MethodCallInliner.canInline(method))
if (DsMethodCallInliner.canInline(method))
inlinedMethods.Add(method);
}
}

View File

@ -0,0 +1,366 @@
/*
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
de4dot is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
de4dot is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with de4dot. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Collections.Generic;
using Mono.Cecil;
using Mono.Cecil.Cil;
using Mono.Cecil.Metadata;
using de4dot.blocks;
using de4dot.blocks.cflow;
namespace de4dot.code.deobfuscators.DeepSea {
class DsMethodCallInliner : MethodCallInlinerBase {
InstructionEmulator instructionEmulator = new InstructionEmulator();
List<ParameterDefinition> parameters;
ParameterDefinition arg1, arg2;
Value returnValue;
MethodDefinition methodToInline;
protected override bool deobfuscateInternal() {
bool changed = false;
var instructions = block.Instructions;
for (int i = 0; i < instructions.Count; i++) {
var instr = instructions[i].Instruction;
if (instr.OpCode.Code == Code.Call)
changed |= inlineMethod(instr, i);
}
return changed;
}
bool inlineMethod(Instruction callInstr, int instrIndex) {
var method = callInstr.Operand as MethodDefinition;
if (method == null)
return false;
if (!canInline(method))
return false;
if (instrIndex < 2)
return false;
var ldci4_1st = block.Instructions[instrIndex - 2];
var ldci4_2nd = block.Instructions[instrIndex - 1];
if (!ldci4_1st.isLdcI4() || !ldci4_2nd.isLdcI4())
return false;
if (!inlineMethod(method, instrIndex, ldci4_1st.getLdcI4Value(), ldci4_2nd.getLdcI4Value()))
return false;
return true;
}
bool inlineMethod(MethodDefinition methodToInline, int instrIndex, int const1, int const2) {
this.methodToInline = methodToInline;
parameters = DotNetUtils.getParameters(methodToInline);
arg1 = parameters[parameters.Count - 2];
arg2 = parameters[parameters.Count - 1];
returnValue = null;
instructionEmulator.init(methodToInline);
foreach (var arg in parameters) {
if (arg.ParameterType.EType >= ElementType.Boolean && arg.ParameterType.EType <= ElementType.U4)
instructionEmulator.setArg(arg, new Int32Value(0));
}
instructionEmulator.setArg(arg1, new Int32Value(const1));
instructionEmulator.setArg(arg2, new Int32Value(const2));
int index = 0;
if (!emulateInstructions(ref index, false))
return false;
var patcher = tryInlineOtherMethod(instrIndex, methodToInline, methodToInline.Body.Instructions[index], index + 1, 2);
if (patcher == null)
return false;
if (!emulateToReturn(patcher.afterIndex, patcher.lastInstr))
return false;
patcher.patch(block);
block.insert(instrIndex, Instruction.Create(OpCodes.Pop));
block.insert(instrIndex, Instruction.Create(OpCodes.Pop));
return true;
}
bool emulateInstructions(ref int index, bool allowUnknownArgs) {
Instruction instr;
var instrs = methodToInline.Body.Instructions;
int counter = 0;
var foundOpCodes = new Dictionary<Code, bool>();
bool checkInstrs = false;
while (true) {
if (counter++ >= 50)
return false;
if (index < 0 || index >= instrs.Count)
return false;
instr = instrs[index];
foundOpCodes[instr.OpCode.Code] = true;
switch (instr.OpCode.Code) {
case Code.Stloc:
case Code.Stloc_S:
case Code.Stloc_0:
case Code.Stloc_1:
case Code.Stloc_2:
case Code.Stloc_3:
case Code.Ldloc:
case Code.Ldloc_S:
case Code.Ldloc_0:
case Code.Ldloc_1:
case Code.Ldloc_2:
case Code.Ldloc_3:
case Code.Ldc_I4:
case Code.Ldc_I4_0:
case Code.Ldc_I4_1:
case Code.Ldc_I4_2:
case Code.Ldc_I4_3:
case Code.Ldc_I4_4:
case Code.Ldc_I4_5:
case Code.Ldc_I4_6:
case Code.Ldc_I4_7:
case Code.Ldc_I4_8:
case Code.Ldc_I4_M1:
case Code.Ldc_I4_S:
case Code.Add:
case Code.Sub:
case Code.Xor:
case Code.Or:
case Code.Nop:
case Code.Dup:
case Code.Mul:
case Code.Rem:
case Code.Div:
instructionEmulator.emulate(instr);
index++;
break;
case Code.Ldarg:
case Code.Ldarg_S:
case Code.Ldarg_0:
case Code.Ldarg_1:
case Code.Ldarg_2:
case Code.Ldarg_3:
var arg = DotNetUtils.getParameter(parameters, instr);
if (arg != arg1 && arg != arg2) {
if (!allowUnknownArgs)
goto done;
checkInstrs = true;
}
instructionEmulator.emulate(instr);
index++;
break;
case Code.Call:
case Code.Callvirt:
case Code.Newobj:
goto done;
case Code.Switch:
var value = instructionEmulator.pop() as Int32Value;
if (value == null || !value.allBitsValid())
return false;
var targets = (Instruction[])instr.Operand;
if (value.value >= 0 && value.value < targets.Length)
index = instrs.IndexOf(targets[value.value]);
else
index++;
break;
case Code.Br:
case Code.Br_S:
index = instrs.IndexOf((Instruction)instr.Operand);
break;
case Code.Brtrue:
case Code.Brtrue_S:
index = emulateBrtrue(index);
break;
case Code.Brfalse:
case Code.Brfalse_S:
index = emulateBrfalse(index);
break;
case Code.Isinst:
case Code.Castclass:
if (returnValue != null && instructionEmulator.peek() == returnValue) {
// Do nothing
}
else
instructionEmulator.emulate(instr);
index++;
break;
default:
if (instr.OpCode.OpCodeType != OpCodeType.Prefix)
goto done;
index++;
break;
}
}
done:
if (checkInstrs) {
if (!foundOpCodes.ContainsKey(Code.Ldc_I4_1))
return false;
if (!foundOpCodes.ContainsKey(Code.Ldc_I4_2))
return false;
if (!foundOpCodes.ContainsKey(Code.Add))
return false;
if (!foundOpCodes.ContainsKey(Code.Dup))
return false;
if (!foundOpCodes.ContainsKey(Code.Mul))
return false;
if (!foundOpCodes.ContainsKey(Code.Rem))
return false;
if (!foundOpCodes.ContainsKey(Code.Brtrue) && !foundOpCodes.ContainsKey(Code.Brtrue_S))
return false;
}
return true;
}
int emulateBranch(int stackArgs, Bool3 cond, Instruction instrTrue, Instruction instrFalse) {
if (cond == Bool3.Unknown)
return -1;
Instruction instr = cond == Bool3.True ? instrTrue : instrFalse;
return methodToInline.Body.Instructions.IndexOf(instr);
}
int emulateBrtrue(int instrIndex) {
var val1 = instructionEmulator.pop();
var instr = methodToInline.Body.Instructions[instrIndex];
var instrTrue = (Instruction)instr.Operand;
var instrFalse = methodToInline.Body.Instructions[instrIndex + 1];
if (val1.isInt32())
return emulateBranch(1, Int32Value.compareTrue((Int32Value)val1), instrTrue, instrFalse);
return -1;
}
int emulateBrfalse(int instrIndex) {
var val1 = instructionEmulator.pop();
var instr = methodToInline.Body.Instructions[instrIndex];
var instrTrue = (Instruction)instr.Operand;
var instrFalse = methodToInline.Body.Instructions[instrIndex + 1];
if (val1.isInt32())
return emulateBranch(1, Int32Value.compareFalse((Int32Value)val1), instrTrue, instrFalse);
return -1;
}
bool emulateToReturn(int index, Instruction lastInstr) {
int pushes, pops;
DotNetUtils.calculateStackUsage(lastInstr, false, out pushes, out pops);
for (int i = 0; i < pops; i++)
instructionEmulator.pop();
returnValue = null;
if (pushes != 0) {
returnValue = new UnknownValue();
instructionEmulator.setProtected(returnValue);
instructionEmulator.push(returnValue);
}
if (!emulateInstructions(ref index, true))
return false;
if (index >= methodToInline.Body.Instructions.Count)
return false;
if (methodToInline.Body.Instructions[index].OpCode.Code != Code.Ret)
return false;
if (returnValue != null) {
if (instructionEmulator.pop() != returnValue)
return false;
}
return instructionEmulator.stackSize() == 0;
}
public static bool canInline(MethodDefinition method) {
if (method == null || method.Body == null)
return false;
if (method.Attributes != (MethodAttributes.Assembly | MethodAttributes.Static))
return false;
if (method.GenericParameters.Count > 0)
return false;
if (method.Body.ExceptionHandlers.Count > 0)
return false;
var parameters = method.Parameters;
int paramCount = parameters.Count;
if (paramCount < 2)
return false;
var param1 = parameters[paramCount - 1];
var param2 = parameters[paramCount - 2];
if (hasSecuritySafeCriticalAttribute(method)) {
if (!isIntType(param1.ParameterType.EType))
return false;
if (!isIntType(param2.ParameterType.EType))
return false;
}
else {
if (param1.ParameterType.EType != ElementType.I4)
return false;
if (param2.ParameterType.EType != ElementType.I4)
return false;
if (!checkInstrs(method))
return false;
}
return true;
}
static bool isIntType(ElementType etype) {
return etype == ElementType.Char || etype == ElementType.I2 || etype == ElementType.I4;
}
static bool hasSecuritySafeCriticalAttribute(MethodDefinition method) {
return hasAttribute(method, "System.Security.SecuritySafeCriticalAttribute");
}
static bool hasAttribute(MethodDefinition method, string attrName) {
foreach (var attr in method.CustomAttributes) {
if (attr.Constructor.DeclaringType.FullName == attrName)
return true;
}
return false;
}
static bool checkInstrs(MethodDefinition method) {
bool foundSwitch = false, foundXor = false;
foreach (var instr in method.Body.Instructions) {
if (foundSwitch && foundXor)
break;
switch (instr.OpCode.Code) {
case Code.Switch:
foundSwitch = true;
break;
case Code.Xor:
foundXor = true;
break;
}
}
return foundSwitch && foundXor;
}
protected override bool isReturn(MethodDefinition methodToInline, int instrIndex) {
int oldIndex = instrIndex;
if (base.isReturn(methodToInline, oldIndex))
return true;
return false;
}
}
}

View File

@ -1,208 +0,0 @@
/*
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
de4dot is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
de4dot is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with de4dot. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Collections.Generic;
using Mono.Cecil;
using Mono.Cecil.Cil;
using de4dot.blocks;
using de4dot.blocks.cflow;
namespace de4dot.code.deobfuscators.DeepSea {
class MethodCallInliner : MethodCallInlinerBase {
InstructionEmulator instructionEmulator = new InstructionEmulator();
protected override bool deobfuscateInternal() {
bool changed = false;
var instructions = block.Instructions;
for (int i = 0; i < instructions.Count; i++) {
var instr = instructions[i].Instruction;
if (instr.OpCode.Code == Code.Call)
changed |= inlineMethod(instr, i);
}
return changed;
}
bool inlineMethod(Instruction callInstr, int instrIndex) {
var method = callInstr.Operand as MethodDefinition;
if (method == null)
return false;
if (!canInline(method))
return false;
if (instrIndex < 2)
return false;
var ldci4_1st = block.Instructions[instrIndex - 2];
var ldci4_2nd = block.Instructions[instrIndex - 1];
if (!ldci4_1st.isLdcI4() || !ldci4_2nd.isLdcI4())
return false;
if (!inlineMethod(method, instrIndex, ldci4_1st.getLdcI4Value(), ldci4_2nd.getLdcI4Value()))
return false;
return true;
}
bool inlineMethod(MethodDefinition methodToInline, int instrIndex, int const1, int const2) {
var parameters = DotNetUtils.getParameters(methodToInline);
var arg1 = parameters[parameters.Count - 2];
var arg2 = parameters[parameters.Count - 1];
instructionEmulator.init(methodToInline);
instructionEmulator.setArg(arg1, new Int32Value(const1));
instructionEmulator.setArg(arg2, new Int32Value(const2));
Instruction instr;
var instrs = methodToInline.Body.Instructions;
int index = 0;
int counter = 0;
while (true) {
if (counter++ >= 50)
return false;
if (index >= instrs.Count)
return false;
instr = instrs[index];
switch (instr.OpCode.Code) {
case Code.Stloc:
case Code.Stloc_S:
case Code.Stloc_0:
case Code.Stloc_1:
case Code.Stloc_2:
case Code.Stloc_3:
case Code.Ldloc:
case Code.Ldloc_S:
case Code.Ldloc_0:
case Code.Ldloc_1:
case Code.Ldloc_2:
case Code.Ldloc_3:
case Code.Ldc_I4:
case Code.Ldc_I4_0:
case Code.Ldc_I4_1:
case Code.Ldc_I4_2:
case Code.Ldc_I4_3:
case Code.Ldc_I4_4:
case Code.Ldc_I4_5:
case Code.Ldc_I4_6:
case Code.Ldc_I4_7:
case Code.Ldc_I4_8:
case Code.Ldc_I4_M1:
case Code.Ldc_I4_S:
case Code.Add:
case Code.Sub:
case Code.Xor:
case Code.Or:
case Code.Nop:
instructionEmulator.emulate(instr);
index++;
break;
case Code.Ldarg:
case Code.Ldarg_S:
case Code.Ldarg_0:
case Code.Ldarg_1:
case Code.Ldarg_2:
case Code.Ldarg_3:
var arg = DotNetUtils.getParameter(parameters, instr);
if (arg != arg1 && arg != arg2)
goto checkInline;
instructionEmulator.emulate(instr);
index++;
break;
case Code.Call:
case Code.Callvirt:
case Code.Newobj:
goto checkInline;
case Code.Switch:
var value = instructionEmulator.pop() as Int32Value;
if (value == null || !value.allBitsValid())
return false;
var targets = (Instruction[])instr.Operand;
if (value.value >= 0 && value.value < targets.Length)
index = instrs.IndexOf(targets[value.value]);
else
index++;
break;
case Code.Br:
case Code.Br_S:
index = instrs.IndexOf((Instruction)instr.Operand);
break;
default:
if (instr.OpCode.OpCodeType != OpCodeType.Prefix)
return false;
index++;
break;
}
}
checkInline:
if (!inlineOtherMethod(instrIndex, methodToInline, instr, index + 1, 2))
return false;
block.insert(instrIndex, Instruction.Create(OpCodes.Pop));
block.insert(instrIndex, Instruction.Create(OpCodes.Pop));
return true;
}
public static bool canInline(MethodDefinition method) {
if (method == null || method.Body == null)
return false;
if (method.GenericParameters.Count > 0)
return false;
if (method.Body.ExceptionHandlers.Count > 0)
return false;
var parameters = method.Parameters;
int paramCount = parameters.Count;
if (paramCount < 2)
return false;
if (parameters[paramCount - 1].ParameterType.FullName != "System.Int32")
return false;
if (parameters[paramCount - 2].ParameterType.FullName != "System.Int32")
return false;
if (method.Attributes != (MethodAttributes.Assembly | MethodAttributes.Static))
return false;
if (!checkInstrs(method))
return false;
return true;
}
static bool checkInstrs(MethodDefinition method) {
bool foundSwitch = false, foundXor = false;
foreach (var instr in method.Body.Instructions) {
if (foundSwitch && foundXor)
break;
switch (instr.OpCode.Code) {
case Code.Switch:
foundSwitch = true;
break;
case Code.Xor:
foundXor = true;
break;
}
}
return foundSwitch && foundXor;
}
}
}