From 73e15c091974deb69f34f165d4bd457e997caeed Mon Sep 17 00:00:00 2001 From: de4dot Date: Fri, 9 Nov 2012 11:34:23 +0100 Subject: [PATCH] Change method sig to take a IPEImage instead of a PEImage --- de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs | 6 +++--- de4dot.code/deobfuscators/DeobfuscatorBase.cs | 2 +- de4dot.code/deobfuscators/IDeobfuscator.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs index e1595e98..0b3655de 100644 --- a/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs @@ -118,12 +118,12 @@ namespace de4dot.code.deobfuscators.Agile_NET { base.init(module); } - public override byte[] unpackNativeFile(PEImage peImage) { + public override byte[] unpackNativeFile(IPEImage peImage) { return unpackNativeFile1(peImage) ?? unpackNativeFile2(peImage); } // Old CS versions - byte[] unpackNativeFile1(PEImage peImage) { + byte[] unpackNativeFile1(IPEImage peImage) { const int dataDirNum = 6; // debug dir const int dotNetDirNum = 14; @@ -146,7 +146,7 @@ namespace de4dot.code.deobfuscators.Agile_NET { } // CS 1.x - byte[] unpackNativeFile2(PEImage peImage) { + byte[] unpackNativeFile2(IPEImage peImage) { var resources = peImage.Win32Resources; if (resources == null) return null; diff --git a/de4dot.code/deobfuscators/DeobfuscatorBase.cs b/de4dot.code/deobfuscators/DeobfuscatorBase.cs index c9c3ad50..52814778 100644 --- a/de4dot.code/deobfuscators/DeobfuscatorBase.cs +++ b/de4dot.code/deobfuscators/DeobfuscatorBase.cs @@ -112,7 +112,7 @@ namespace de4dot.code.deobfuscators { DefaultDecrypterType = DecrypterType.Static; } - public virtual byte[] unpackNativeFile(PEImage peImage) { + public virtual byte[] unpackNativeFile(IPEImage peImage) { return null; } diff --git a/de4dot.code/deobfuscators/IDeobfuscator.cs b/de4dot.code/deobfuscators/IDeobfuscator.cs index d66e75b3..535f185e 100644 --- a/de4dot.code/deobfuscators/IDeobfuscator.cs +++ b/de4dot.code/deobfuscators/IDeobfuscator.cs @@ -67,7 +67,7 @@ namespace de4dot.code.deobfuscators { IDeobfuscatedFile DeobfuscatedFile { get; set; } // Returns null or the unpacked .NET PE file - byte[] unpackNativeFile(PEImage peImage); + byte[] unpackNativeFile(IPEImage peImage); void init(ModuleDefMD module);