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

Use the new Int32ValueInliner class

Browse Source
This commit is contained in:
de4dot 2012-01-14 12:04:59 +01:00
parent b71e8fdfdc
commit 06e8b9f654
3 changed files with 5 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
de4dot.code/de4dot.code.csproj
View File

@ -120,7 +120,6 @@
<Compile Include="deobfuscators\Goliath_NET\DecrypterBase.cs" />
<Compile Include="deobfuscators\Goliath_NET\Deobfuscator.cs" />
<Compile Include="deobfuscators\Goliath_NET\IntegerDecrypter.cs" />
<Compile Include="deobfuscators\Goliath_NET\IntegerValueInliner.cs" />
<Compile Include="deobfuscators\Goliath_NET\LocalsRestorer.cs" />
<Compile Include="deobfuscators\Goliath_NET\LogicalExpressionFixer.cs" />
<Compile Include="deobfuscators\Goliath_NET\ProxyDelegateFinder.cs" />

10
de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs
View File

@ -85,7 +85,7 @@ namespace de4dot.code.deobfuscators.Goliath_NET {
LogicalExpressionFixer logicalExpressionFixer;
StringDecrypter stringDecrypter;
IntegerDecrypter integerDecrypter;
IntegerValueInliner integerValueInliner;
Int32ValueInliner int32ValueInliner;
ArrayDecrypter arrayDecrypter;
ArrayValueInliner arrayValueInliner;
StrongNameChecker strongNameChecker;
@ -188,9 +188,9 @@ namespace de4dot.code.deobfuscators.Goliath_NET {
arrayDecrypter.initialize();
if (options.DecryptIntegers) {
integerValueInliner = new IntegerValueInliner();
int32ValueInliner = new Int32ValueInliner();
foreach (var method in integerDecrypter.getMethods()) {
integerValueInliner.add(method, (method2, args) => {
int32ValueInliner.add(method, (method2, args) => {
return integerDecrypter.decrypt(method2);
});
}
@ -224,8 +224,8 @@ namespace de4dot.code.deobfuscators.Goliath_NET {
public override void deobfuscateMethodEnd(Blocks blocks) {
stringDecrypter.deobfuscate(blocks);
if (integerValueInliner.HasHandlers)
integerValueInliner.decrypt(blocks);
if (int32ValueInliner.HasHandlers)
int32ValueInliner.decrypt(blocks);
if (arrayValueInliner.HasHandlers)
arrayValueInliner.decrypt(blocks);
if (options.RestoreLocals)

74
de4dot.code/deobfuscators/Goliath_NET/IntegerValueInliner.cs
View File

@ -1,74 +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;
using System.Collections.Generic;
using Mono.Cecil;
using Mono.Cecil.Cil;
using de4dot.blocks;
namespace de4dot.code.deobfuscators.Goliath_NET {
class IntegerValueInliner : MethodReturnValueInliner {
MethodDefinitionAndDeclaringTypeDict<Func<MethodDefinition, object[], int>> intDecrypters = new MethodDefinitionAndDeclaringTypeDict<Func<MethodDefinition, object[], int>>();
class MyCallResult : CallResult {
public MethodReference methodReference;
public MyCallResult(Block block, int callEndIndex, MethodReference method)
: base(block, callEndIndex) {
this.methodReference = method;
}
}
public bool HasHandlers {
get { return intDecrypters.Count != 0; }
}
public void add(MethodDefinition method, Func<MethodDefinition, object[], int> handler) {
if (method == null)
return;
if (intDecrypters.find(method) != null)
throw new ApplicationException(string.Format("Handler for method {0:X8} has already been added", method.MetadataToken.ToInt32()));
intDecrypters.add(method, handler);
}
protected override void inlineReturnValues(IList<CallResult> callResults) {
foreach (var callResult in callResults) {
var block = callResult.block;
int num = callResult.callEndIndex - callResult.callStartIndex + 1;
block.replace(callResult.callStartIndex, num, DotNetUtils.createLdci4((int)callResult.returnValue));
Log.v("Decrypted integer: {0}", callResult.returnValue);
}
}
protected override void inlineAllCalls() {
foreach (var tmp in callResults) {
var callResult = (MyCallResult)tmp;
var handler = intDecrypters.find(callResult.methodReference);
callResult.returnValue = handler((MethodDefinition)callResult.methodReference, callResult.args);
}
}
protected override CallResult createCallResult(MethodReference method, Block block, int callInstrIndex) {
if (intDecrypters.find(method) == null)
return null;
return new MyCallResult(block, callInstrIndex, method);
}
}
}