Call method later
This commit is contained in:
parent
44b90d658a
commit
47a3034259
|
@ -36,7 +36,6 @@ namespace de4dot.code {
|
||||||
public class ObfuscatedFile : IObfuscatedFile, IDeobfuscatedFile {
|
public class ObfuscatedFile : IObfuscatedFile, IDeobfuscatedFile {
|
||||||
Options options;
|
Options options;
|
||||||
ModuleDefinition module;
|
ModuleDefinition module;
|
||||||
IList<MethodDefinition> allMethods;
|
|
||||||
IDeobfuscator deob;
|
IDeobfuscator deob;
|
||||||
IDeobfuscatorContext deobfuscatorContext;
|
IDeobfuscatorContext deobfuscatorContext;
|
||||||
AssemblyModule assemblyModule;
|
AssemblyModule assemblyModule;
|
||||||
|
@ -165,9 +164,6 @@ namespace de4dot.code {
|
||||||
loadModule(deobfuscators);
|
loadModule(deobfuscators);
|
||||||
AssemblyResolver.Instance.addSearchDirectory(Utils.getDirName(Filename));
|
AssemblyResolver.Instance.addSearchDirectory(Utils.getDirName(Filename));
|
||||||
AssemblyResolver.Instance.addSearchDirectory(Utils.getDirName(NewFilename));
|
AssemblyResolver.Instance.addSearchDirectory(Utils.getDirName(NewFilename));
|
||||||
|
|
||||||
allMethods = getAllMethods();
|
|
||||||
|
|
||||||
detectObfuscator(deobfuscators);
|
detectObfuscator(deobfuscators);
|
||||||
if (deob == null)
|
if (deob == null)
|
||||||
throw new ApplicationException("Could not detect obfuscator!");
|
throw new ApplicationException("Could not detect obfuscator!");
|
||||||
|
@ -395,7 +391,6 @@ namespace de4dot.code {
|
||||||
Log.v("Reloading decrypted assembly (original filename: {0})", Filename);
|
Log.v("Reloading decrypted assembly (original filename: {0})", Filename);
|
||||||
simpleDeobfuscatorFlags.Clear();
|
simpleDeobfuscatorFlags.Clear();
|
||||||
module = assemblyModule.reload(newModuleData, dumpedMethods);
|
module = assemblyModule.reload(newModuleData, dumpedMethods);
|
||||||
allMethods = getAllMethods();
|
|
||||||
deob = deob.moduleReloaded(module);
|
deob = deob.moduleReloaded(module);
|
||||||
initializeDeobfuscator();
|
initializeDeobfuscator();
|
||||||
deob.DeobfuscatedFile = this;
|
deob.DeobfuscatedFile = this;
|
||||||
|
@ -555,7 +550,7 @@ namespace de4dot.code {
|
||||||
Log.v("Deobfuscating methods");
|
Log.v("Deobfuscating methods");
|
||||||
var methodPrinter = new MethodPrinter();
|
var methodPrinter = new MethodPrinter();
|
||||||
var cflowDeobfuscator = new BlocksCflowDeobfuscator(deob.BlocksDeobfuscators);
|
var cflowDeobfuscator = new BlocksCflowDeobfuscator(deob.BlocksDeobfuscators);
|
||||||
foreach (var method in allMethods) {
|
foreach (var method in getAllMethods()) {
|
||||||
Log.v("Deobfuscating {0} ({1:X8})", Utils.removeNewlines(method), method.MetadataToken.ToUInt32());
|
Log.v("Deobfuscating {0} ({1:X8})", Utils.removeNewlines(method), method.MetadataToken.ToUInt32());
|
||||||
Log.indent();
|
Log.indent();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user