Fix 'shadow calls' obfuscation
This commit is contained in:
parent
c2313110b8
commit
d512889833
|
@ -83,6 +83,7 @@
|
||||||
<Compile Include="deobfuscators\CodeVeil\v3_v4\MethodsDecrypter.cs" />
|
<Compile Include="deobfuscators\CodeVeil\v3_v4\MethodsDecrypter.cs" />
|
||||||
<Compile Include="deobfuscators\CodeVeil\v3_v4\StringDecrypter.cs" />
|
<Compile Include="deobfuscators\CodeVeil\v3_v4\StringDecrypter.cs" />
|
||||||
<Compile Include="deobfuscators\CodeVeil\v5\Deobfuscator.cs" />
|
<Compile Include="deobfuscators\CodeVeil\v5\Deobfuscator.cs" />
|
||||||
|
<Compile Include="deobfuscators\CodeVeil\v5\ProxyDelegateFinder.cs" />
|
||||||
<Compile Include="deobfuscators\CryptoObfuscator\AntiDebugger.cs" />
|
<Compile Include="deobfuscators\CryptoObfuscator\AntiDebugger.cs" />
|
||||||
<Compile Include="deobfuscators\CryptoObfuscator\AssemblyResolver.cs" />
|
<Compile Include="deobfuscators\CryptoObfuscator\AssemblyResolver.cs" />
|
||||||
<Compile Include="deobfuscators\CryptoObfuscator\Deobfuscator.cs" />
|
<Compile Include="deobfuscators\CryptoObfuscator\Deobfuscator.cs" />
|
||||||
|
|
|
@ -54,6 +54,8 @@ namespace de4dot.code.deobfuscators.CodeVeil.v5 {
|
||||||
Options options;
|
Options options;
|
||||||
string obfuscatorName = DeobfuscatorInfo.THE_NAME + " 5.x";
|
string obfuscatorName = DeobfuscatorInfo.THE_NAME + " 5.x";
|
||||||
|
|
||||||
|
ProxyDelegateFinder proxyDelegateFinder;
|
||||||
|
|
||||||
internal class Options : OptionsBase {
|
internal class Options : OptionsBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +79,7 @@ namespace de4dot.code.deobfuscators.CodeVeil.v5 {
|
||||||
protected override int detectInternal() {
|
protected override int detectInternal() {
|
||||||
int val = 0;
|
int val = 0;
|
||||||
|
|
||||||
int sum = 0;
|
int sum = toInt32(proxyDelegateFinder.Detected);
|
||||||
if (sum > 0)
|
if (sum > 0)
|
||||||
val += 100 + 10 * (sum - 1);
|
val += 100 + 10 * (sum - 1);
|
||||||
|
|
||||||
|
@ -85,18 +87,24 @@ namespace de4dot.code.deobfuscators.CodeVeil.v5 {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void scanForObfuscator() {
|
protected override void scanForObfuscator() {
|
||||||
//TODO:
|
proxyDelegateFinder = new ProxyDelegateFinder(module);
|
||||||
|
proxyDelegateFinder.findDelegateCreator();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void deobfuscateBegin() {
|
public override void deobfuscateBegin() {
|
||||||
base.deobfuscateBegin();
|
base.deobfuscateBegin();
|
||||||
|
|
||||||
//TODO:
|
proxyDelegateFinder.initialize();
|
||||||
|
proxyDelegateFinder.find();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void deobfuscateMethodEnd(blocks.Blocks blocks) {
|
||||||
|
proxyDelegateFinder.deobfuscate(blocks);
|
||||||
|
base.deobfuscateMethodEnd(blocks);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void deobfuscateEnd() {
|
public override void deobfuscateEnd() {
|
||||||
//TODO:
|
removeProxyDelegates(proxyDelegateFinder, false); //TODO: Should be 'true'
|
||||||
|
|
||||||
base.deobfuscateEnd();
|
base.deobfuscateEnd();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
190
de4dot.code/deobfuscators/CodeVeil/v5/ProxyDelegateFinder.cs
Normal file
190
de4dot.code/deobfuscators/CodeVeil/v5/ProxyDelegateFinder.cs
Normal file
|
@ -0,0 +1,190 @@
|
||||||
|
/*
|
||||||
|
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;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using Mono.Cecil;
|
||||||
|
using Mono.Cecil.Cil;
|
||||||
|
using de4dot.blocks;
|
||||||
|
|
||||||
|
namespace de4dot.code.deobfuscators.CodeVeil.v5 {
|
||||||
|
class ProxyDelegateFinder : ProxyDelegateFinderBase {
|
||||||
|
Info info = new Info();
|
||||||
|
BinaryReader reader;
|
||||||
|
|
||||||
|
class Info {
|
||||||
|
public TypeDefinition mainType;
|
||||||
|
public TypeDefinition proxyType;
|
||||||
|
public MethodDefinition initMethod;
|
||||||
|
public FieldDefinition dataField;
|
||||||
|
}
|
||||||
|
|
||||||
|
class Context {
|
||||||
|
public int offset;
|
||||||
|
|
||||||
|
public Context(int offset) {
|
||||||
|
this.offset = offset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProxyDelegateFinder(ModuleDefinition module)
|
||||||
|
: base(module) {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override object checkCctor(TypeDefinition type, MethodDefinition cctor) {
|
||||||
|
var instrs = cctor.Body.Instructions;
|
||||||
|
for (int i = 0; i < instrs.Count - 1; i++) {
|
||||||
|
var ldci4 = instrs[i];
|
||||||
|
if (!DotNetUtils.isLdcI4(ldci4))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var call = instrs[i + 1];
|
||||||
|
if (call.OpCode.Code != Code.Call)
|
||||||
|
continue;
|
||||||
|
if (call.Operand != info.initMethod)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
int offset = DotNetUtils.getLdcI4Value(ldci4);
|
||||||
|
reader.BaseStream.Position = offset;
|
||||||
|
int rid = DeobUtils.readVariableLengthInt32(reader);
|
||||||
|
if (rid != type.MetadataToken.RID)
|
||||||
|
throw new ApplicationException("Invalid RID");
|
||||||
|
return string.Empty; // It's non-null
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void onFoundProxyDelegate(TypeDefinition type) {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void getCallInfo(object context, FieldDefinition field, out MethodReference calledMethod, out OpCode callOpcode) {
|
||||||
|
byte flags = reader.ReadByte();
|
||||||
|
|
||||||
|
int methodToken = 0x06000000 + ((flags & 0x3F) << 24) + DeobUtils.readVariableLengthInt32(reader);
|
||||||
|
int genericTypeToken = (flags & 0x40) == 0 ? -1 : 0x1B000000 + DeobUtils.readVariableLengthInt32(reader);
|
||||||
|
callOpcode = (flags & 0x80) != 0 ? OpCodes.Callvirt : OpCodes.Call;
|
||||||
|
|
||||||
|
calledMethod = module.LookupToken(methodToken) as MethodReference;
|
||||||
|
if (calledMethod == null)
|
||||||
|
throw new ApplicationException("Could not find method");
|
||||||
|
if (genericTypeToken != -1 && calledMethod.DeclaringType.MetadataToken.ToInt32() != genericTypeToken)
|
||||||
|
throw new ApplicationException("Invalid declaring type token");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void findDelegateCreator() {
|
||||||
|
var moduleCctor = DotNetUtils.getModuleTypeCctor(module);
|
||||||
|
if (moduleCctor == null)
|
||||||
|
return;
|
||||||
|
foreach (var call in DotNetUtils.getCalledMethods(module, moduleCctor)) {
|
||||||
|
if (!call.Item2.IsStatic)
|
||||||
|
continue;
|
||||||
|
if (!DotNetUtils.isMethod(call.Item2, "System.Void", "(System.Boolean,System.Boolean)"))
|
||||||
|
continue;
|
||||||
|
var infoTmp = new Info();
|
||||||
|
if (!initializeInfo(infoTmp, call.Item1))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
info = infoTmp;
|
||||||
|
setDelegateCreatorMethod(info.initMethod);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool initializeInfo(Info infoTmp, TypeDefinition type) {
|
||||||
|
foreach (var dtype in type.NestedTypes) {
|
||||||
|
var cctor = DotNetUtils.getMethod(dtype, ".cctor");
|
||||||
|
if (cctor == null)
|
||||||
|
continue;
|
||||||
|
if (!initProxyType(infoTmp, cctor))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
infoTmp.mainType = type;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool initProxyType(Info infoTmp, MethodDefinition method) {
|
||||||
|
foreach (var call in DotNetUtils.getCalledMethods(module, method)) {
|
||||||
|
if (!call.Item2.IsStatic)
|
||||||
|
continue;
|
||||||
|
if (!DotNetUtils.isMethod(call.Item2, "System.Void", "(System.Int32)"))
|
||||||
|
continue;
|
||||||
|
if (!checkProxyType(infoTmp, call.Item1))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
infoTmp.proxyType = call.Item1;
|
||||||
|
infoTmp.initMethod = call.Item2;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static string[] requiredFields = new string[] {
|
||||||
|
"System.Byte[]",
|
||||||
|
"System.Int32",
|
||||||
|
"System.ModuleHandle",
|
||||||
|
"System.Reflection.Emit.OpCode",
|
||||||
|
"System.Reflection.Emit.OpCode[]",
|
||||||
|
};
|
||||||
|
bool checkProxyType(Info infoTmp, TypeDefinition type) {
|
||||||
|
if (type.NestedTypes.Count != 1)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!new FieldTypes(type).all(requiredFields))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
var fields = getRvaFields(type);
|
||||||
|
if (fields.Count != 1)
|
||||||
|
return false;
|
||||||
|
var field = fields[0];
|
||||||
|
var fieldType = DotNetUtils.getType(module, field.FieldType);
|
||||||
|
if (type.NestedTypes.IndexOf(fieldType) < 0)
|
||||||
|
return false;
|
||||||
|
if (field.InitialValue == null || field.InitialValue.Length == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
infoTmp.dataField = field;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<FieldDefinition> getRvaFields(TypeDefinition type) {
|
||||||
|
var fields = new List<FieldDefinition>();
|
||||||
|
foreach (var field in type.Fields) {
|
||||||
|
if (field.RVA != 0)
|
||||||
|
fields.Add(field);
|
||||||
|
}
|
||||||
|
return fields;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override IEnumerable<TypeDefinition> getDelegateTypes() {
|
||||||
|
return info.mainType.NestedTypes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void initialize() {
|
||||||
|
if (info.dataField == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var decompressed = DeobUtils.inflate(info.dataField.InitialValue, true);
|
||||||
|
reader = new BinaryReader(new MemoryStream(decompressed));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user