From 4be6156d9b6ed79dae0a2666f692396dfc46c60b Mon Sep 17 00:00:00 2001 From: ViR Dash Date: Sat, 19 Aug 2017 17:44:30 +0300 Subject: [PATCH] Move ConfuserEx warning messages to display during the correct deobfuscation stage --- de4dot.code/deobfuscators/ConfuserEx/Deobfuscator.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/de4dot.code/deobfuscators/ConfuserEx/Deobfuscator.cs b/de4dot.code/deobfuscators/ConfuserEx/Deobfuscator.cs index 56b04697..4428fb36 100644 --- a/de4dot.code/deobfuscators/ConfuserEx/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/ConfuserEx/Deobfuscator.cs @@ -105,8 +105,15 @@ namespace de4dot.code.deobfuscators.ConfuserEx { _lzmaFinder = new LzmaFinder(module, DeobfuscatedFile); _lzmaFinder.Find(); + _constantDecrypter = new ConstantsDecrypter(module, _lzmaFinder.Method, DeobfuscatedFile); + Logger.w( + "Constants decryption enabled! Please note that the decryption method has to be set manually!"); //TODO: Remove + _resourceDecrypter = new ResourceDecrypter(module, _lzmaFinder.Method, DeobfuscatedFile); + Logger.w( + "Resource decryption detected! Please note that the decryption method has to be set manually!"); //TODO: Remove + if (_lzmaFinder.FoundLzma) { _constantDecrypter.Find(); @@ -144,9 +151,6 @@ namespace de4dot.code.deobfuscators.ConfuserEx { if (_constantDecrypter.Detected) { - Logger.w( - "Constants encryption detected! Please note that the decryption method has to be set manually!"); //TODO: Remove - _sbyteValueInliner = new SByteValueInliner(); _byteValueInliner = new ByteValueInliner(); _int16ValueInliner = new Int16ValueInliner(); @@ -189,8 +193,6 @@ namespace de4dot.code.deobfuscators.ConfuserEx } if (_resourceDecrypter.Detected) { - Logger.w( - "Resource encryption detected! Please note that the decryption method has to be set manually!"); //TODO: Remove _resourceDecrypter.Fix(); }