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

Rename proxy class to ...V10

Browse Source
This commit is contained in:
de4dot 2012-08-02 17:23:16 +02:00
parent 1f4ec139db
commit b5ef7a7b12
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
de4dot.code/de4dot.code.csproj
View File

@ -80,7 +80,7 @@
<Compile Include="deobfuscators\Confuser\MemoryMethodsDecrypter.cs" />
<Compile Include="deobfuscators\Confuser\MethodsDecrypterBase.cs" />
<Compile Include="deobfuscators\Confuser\ProxyCallFixer.cs" />
<Compile Include="deobfuscators\Confuser\ProxyCallFixerV1.cs" />
<Compile Include="deobfuscators\Confuser\ProxyCallFixerV10.cs" />
<Compile Include="deobfuscators\Confuser\ResourceDecrypter.cs" />
<Compile Include="deobfuscators\Confuser\StringDecrypter.cs" />
<Compile Include="deobfuscators\Confuser\Unpacker.cs" />

24
de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
View File

@ -74,7 +74,7 @@ namespace de4dot.code.deobfuscators.Confuser {
JitMethodsDecrypter jitMethodsDecrypter;
MemoryMethodsDecrypter memoryMethodsDecrypter;
ProxyCallFixer proxyCallFixer;
ProxyCallFixerV1 proxyCallFixerV1;
ProxyCallFixerV10 proxyCallFixerV10;
AntiDebugger antiDebugger;
AntiDumping antiDumping;
ResourceDecrypter resourceDecrypter;
@ -133,7 +133,7 @@ namespace de4dot.code.deobfuscators.Confuser {
int sum = toInt32(jitMethodsDecrypter != null ? jitMethodsDecrypter.Detected : false) +
toInt32(memoryMethodsDecrypter != null ? memoryMethodsDecrypter.Detected : false) +
toInt32(proxyCallFixer != null ? proxyCallFixer.Detected : false) +
toInt32(proxyCallFixerV1 != null ? proxyCallFixerV1.Detected : false) +
toInt32(proxyCallFixerV10 != null ? proxyCallFixerV10.Detected : false) +
toInt32(antiDebugger != null ? antiDebugger.Detected : false) +
toInt32(antiDumping != null ? antiDumping.Detected : false) +
toInt32(resourceDecrypter != null ? resourceDecrypter.Detected : false) +
@ -178,8 +178,8 @@ namespace de4dot.code.deobfuscators.Confuser {
proxyCallFixer = new ProxyCallFixer(module, getFileData(), DeobfuscatedFile);
proxyCallFixer.findDelegateCreator();
if (!proxyCallFixer.Detected) {
proxyCallFixerV1 = new ProxyCallFixerV1(module);
proxyCallFixerV1.findDelegateCreator(DeobfuscatedFile);
proxyCallFixerV10 = new ProxyCallFixerV10(module);
proxyCallFixerV10.findDelegateCreator(DeobfuscatedFile);
}
antiDebugger = new AntiDebugger(module);
antiDebugger.find();
@ -313,8 +313,8 @@ namespace de4dot.code.deobfuscators.Confuser {
if (proxyCallFixer != null)
proxyCallFixer.find();
if (proxyCallFixerV1 != null)
proxyCallFixerV1.find();
if (proxyCallFixerV10 != null)
proxyCallFixerV10.find();
removeInvalidResources();
dumpEmbeddedAssemblies();
@ -428,8 +428,8 @@ namespace de4dot.code.deobfuscators.Confuser {
public override void deobfuscateMethodEnd(Blocks blocks) {
if (proxyCallFixer != null)
proxyCallFixer.deobfuscate(blocks);
if (proxyCallFixerV1 != null)
proxyCallFixerV1.deobfuscate(blocks);
if (proxyCallFixerV10 != null)
proxyCallFixerV10.deobfuscate(blocks);
resourceDecrypter.deobfuscate(blocks);
unpacker.deobfuscate(blocks);
if (int32ValueInliner != null) {
@ -444,10 +444,10 @@ namespace de4dot.code.deobfuscators.Confuser {
public override void deobfuscateEnd() {
if (proxyCallFixer != null)
removeProxyDelegates(proxyCallFixer);
if (proxyCallFixerV1 != null) {
if (removeProxyDelegates(proxyCallFixerV1))
addFieldsToBeRemoved(proxyCallFixerV1.Fields, "Proxy delegate instance field");
proxyCallFixerV1.cleanUp();
if (proxyCallFixerV10 != null) {
if (removeProxyDelegates(proxyCallFixerV10))
addFieldsToBeRemoved(proxyCallFixerV10.Fields, "Proxy delegate instance field");
proxyCallFixerV10.cleanUp();
}
constantsDecrypter.cleanUp();

4
de4dot.code/deobfuscators/Confuser/ProxyCallFixerV1.cs → de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs
View File

@ -26,7 +26,7 @@ using Mono.Cecil.Cil;
using de4dot.blocks;
namespace de4dot.code.deobfuscators.Confuser {
class ProxyCallFixerV1 : ProxyCallFixer2 {
class ProxyCallFixerV10 : ProxyCallFixer2 {
MethodDefinitionAndDeclaringTypeDict<ProxyCreatorInfo> methodToInfo = new MethodDefinitionAndDeclaringTypeDict<ProxyCreatorInfo>();
FieldDefinitionAndDeclaringTypeDict<List<MethodDefinition>> fieldToMethods = new FieldDefinitionAndDeclaringTypeDict<List<MethodDefinition>>();
string ourAsm;
@ -117,7 +117,7 @@ namespace de4dot.code.deobfuscators.Confuser {
}
}
public ProxyCallFixerV1(ModuleDefinition module)
public ProxyCallFixerV10(ModuleDefinition module)
: base(module) {
ourAsm = (module.Assembly.Name ?? new AssemblyNameReference(" -1-1-1-1-1- ", new Version(1, 2, 3, 4))).FullName;
}