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

Merge v3-v4 and v5 code

Browse Source
This commit is contained in:
de4dot 2012-02-07 04:45:59 +01:00
parent f1a1188409
commit 0aeee176cc
7 changed files with 31 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
de4dot.code/de4dot.code.csproj
View File

@ -79,11 +79,10 @@
<Compile Include="deobfuscators\CliSecure\ResourceDecrypter.cs" />
<Compile Include="deobfuscators\CliSecure\StackFrameHelper.cs" />
<Compile Include="deobfuscators\CliSecure\StringDecrypter.cs" />
<Compile Include="deobfuscators\CodeVeil\v3_v4\Deobfuscator.cs" />
<Compile Include="deobfuscators\CodeVeil\v3_v4\MethodsDecrypter.cs" />
<Compile Include="deobfuscators\CodeVeil\MethodsDecrypter.cs" />
<Compile Include="deobfuscators\CodeVeil\StringDecrypter.cs" />
<Compile Include="deobfuscators\CodeVeil\v5\Deobfuscator.cs" />
<Compile Include="deobfuscators\CodeVeil\v5\ProxyDelegateFinder.cs" />
<Compile Include="deobfuscators\CodeVeil\Deobfuscator.cs" />
<Compile Include="deobfuscators\CodeVeil\ProxyDelegateFinder.cs" />
<Compile Include="deobfuscators\CryptoObfuscator\AntiDebugger.cs" />
<Compile Include="deobfuscators\CryptoObfuscator\AssemblyResolver.cs" />
<Compile Include="deobfuscators\CryptoObfuscator\Deobfuscator.cs" />

24
de4dot.code/deobfuscators/CodeVeil/v3_v4/Deobfuscator.cs → de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs
View File

@ -21,10 +21,10 @@ using System.Collections.Generic;
using Mono.Cecil;
using Mono.MyStuff;
namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
namespace de4dot.code.deobfuscators.CodeVeil {
public class DeobfuscatorInfo : DeobfuscatorInfoBase {
public const string THE_NAME = "CodeVeil";
public const string THE_TYPE = "cv4";
public const string THE_TYPE = "cv";
const string DEFAULT_REGEX = @"!^[A-Za-z]{1,2}$&" + DeobfuscatorBase.DEFAULT_VALID_NAME_REGEX;
public DeobfuscatorInfo()
@ -53,10 +53,11 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
class Deobfuscator : DeobfuscatorBase {
Options options;
string obfuscatorName = DeobfuscatorInfo.THE_NAME + " 3.x - 4.x";
string obfuscatorName = DeobfuscatorInfo.THE_NAME;
bool foundKillType = false;
MethodsDecrypter methodsDecrypter;
ProxyDelegateFinder proxyDelegateFinder;
StringDecrypter stringDecrypter;
internal class Options : OptionsBase {
@ -83,7 +84,8 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
int val = 0;
int sum = toInt32(methodsDecrypter.Detected) +
toInt32(stringDecrypter.Detected);
toInt32(stringDecrypter.Detected) +
toInt32(proxyDelegateFinder.Detected);
if (sum > 0)
val += 100 + 10 * (sum - 1);
if (foundKillType)
@ -94,6 +96,8 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
protected override void scanForObfuscator() {
findKillType();
proxyDelegateFinder = new ProxyDelegateFinder(module);
proxyDelegateFinder.findDelegateCreator();
methodsDecrypter = new MethodsDecrypter(module);
methodsDecrypter.find();
stringDecrypter = new StringDecrypter(module);
@ -127,6 +131,7 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
newOne.setModule(module);
newOne.methodsDecrypter = new MethodsDecrypter(module, methodsDecrypter);
newOne.stringDecrypter = new StringDecrypter(module, stringDecrypter);
newOne.proxyDelegateFinder = new ProxyDelegateFinder(module, proxyDelegateFinder);
return newOne;
}
@ -141,12 +146,17 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
DeobfuscatedFile.stringDecryptersAdded();
}
//TODO:
proxyDelegateFinder.initialize();
proxyDelegateFinder.find();
}
public override void deobfuscateMethodBegin(blocks.Blocks blocks) {
proxyDelegateFinder.deobfuscate(blocks);
base.deobfuscateMethodBegin(blocks);
}
public override void deobfuscateEnd() {
//TODO:
removeProxyDelegates(proxyDelegateFinder, false); //TODO: Should be 'true'
base.deobfuscateEnd();
}

2
de4dot.code/deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs → de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs
View File

@ -27,7 +27,7 @@ using Mono.MyStuff;
using de4dot.blocks;
using de4dot.code.PE;
namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 {
namespace de4dot.code.deobfuscators.CodeVeil {
// The code isn't currently encrypted at all! But let's keep this class name.
class MethodsDecrypter {
ModuleDefinition module;

6
de4dot.code/deobfuscators/CodeVeil/v5/ProxyDelegateFinder.cs → de4dot.code/deobfuscators/CodeVeil/ProxyDelegateFinder.cs
View File

@ -24,7 +24,7 @@ using Mono.Cecil;
using Mono.Cecil.Cil;
using de4dot.blocks;
namespace de4dot.code.deobfuscators.CodeVeil.v5 {
namespace de4dot.code.deobfuscators.CodeVeil {
class ProxyDelegateFinder : ProxyDelegateFinderBase {
Info info = new Info();
BinaryReader reader;
@ -48,6 +48,10 @@ namespace de4dot.code.deobfuscators.CodeVeil.v5 {
: base(module) {
}
public ProxyDelegateFinder(ModuleDefinition module, ProxyDelegateFinder oldOne)
: base(module, oldOne) {
}
protected override object checkCctor(TypeDefinition type, MethodDefinition cctor) {
var instrs = cctor.Body.Instructions;
for (int i = 0; i < instrs.Count - 1; i++) {

6
de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs
View File

@ -78,9 +78,11 @@ namespace de4dot.code.deobfuscators.CodeVeil {
initMethod = initMethodTmp;
break;
}
find2();
}
public void find2() {
void find2() {
foreach (var type in module.Types) {
if (!checkType(type))
continue;
@ -174,7 +176,7 @@ namespace de4dot.code.deobfuscators.CodeVeil {
}
public void initialize() {
if (stringDataField == null)
if (initMethod == null || stringDataField == null)
return;
var key = getKey(initMethod);

129
de4dot.code/deobfuscators/CodeVeil/v5/Deobfuscator.cs
View File

@ -1,129 +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;
namespace de4dot.code.deobfuscators.CodeVeil.v5 {
public class DeobfuscatorInfo : DeobfuscatorInfoBase {
public const string THE_NAME = "CodeVeil";
public const string THE_TYPE = "cv5";
const string DEFAULT_REGEX = @"!^[A-Za-z]{1,2}$&" + DeobfuscatorBase.DEFAULT_VALID_NAME_REGEX;
public DeobfuscatorInfo()
: base(DEFAULT_REGEX) {
}
public override string Name {
get { return THE_NAME; }
}
public override string Type {
get { return THE_TYPE; }
}
public override IDeobfuscator createDeobfuscator() {
return new Deobfuscator(new Deobfuscator.Options {
ValidNameRegex = validNameRegex.get(),
});
}
protected override IEnumerable<Option> getOptionsInternal() {
return new List<Option>() {
};
}
}
class Deobfuscator : DeobfuscatorBase {
Options options;
string obfuscatorName = DeobfuscatorInfo.THE_NAME + " 5.x";
ProxyDelegateFinder proxyDelegateFinder;
StringDecrypter stringDecrypter;
internal class Options : OptionsBase {
}
public override string Type {
get { return DeobfuscatorInfo.THE_TYPE; }
}
public override string TypeLong {
get { return DeobfuscatorInfo.THE_NAME; }
}
public override string Name {
get { return obfuscatorName; }
}
public Deobfuscator(Options options)
: base(options) {
this.options = options;
}
protected override int detectInternal() {
int val = 0;
int sum = toInt32(proxyDelegateFinder.Detected) +
toInt32(stringDecrypter.Detected);
if (sum > 0)
val += 100 + 10 * (sum - 1);
return val;
}
protected override void scanForObfuscator() {
proxyDelegateFinder = new ProxyDelegateFinder(module);
proxyDelegateFinder.findDelegateCreator();
stringDecrypter = new StringDecrypter(module);
stringDecrypter.find2();
}
public override void deobfuscateBegin() {
base.deobfuscateBegin();
if (Operations.DecryptStrings != OpDecryptString.None) {
stringDecrypter.initialize();
staticStringInliner.add(stringDecrypter.DecryptMethod, (method, args) => {
return stringDecrypter.decrypt((int)args[0]);
});
DeobfuscatedFile.stringDecryptersAdded();
}
proxyDelegateFinder.initialize();
proxyDelegateFinder.find();
}
public override void deobfuscateMethodBegin(blocks.Blocks blocks) {
proxyDelegateFinder.deobfuscate(blocks);
base.deobfuscateMethodBegin(blocks);
}
public override void deobfuscateEnd() {
removeProxyDelegates(proxyDelegateFinder, false); //TODO: Should be 'true'
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
//TODO:
return list;
}
}
}

3
de4dot.cui/Program.cs
View File

@ -32,8 +32,7 @@ namespace de4dot.cui {
new de4dot.code.deobfuscators.Unknown.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.Babel_NET.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.CliSecure.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.CodeVeil.v3_v4.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.CodeVeil.v5.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.CodeVeil.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.CryptoObfuscator.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.DeepSea.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.Dotfuscator.DeobfuscatorInfo(),