From f87fabd6aaacfb60a63c077650107f8977cf580a Mon Sep 17 00:00:00 2001 From: de4dot Date: Wed, 21 Dec 2011 18:55:36 +0100 Subject: [PATCH] Move DNR v3 and v4 code to a DNR sub dir --- de4dot.code/de4dot.code.csproj | 44 +++++++++---------- .../v3}/AntiStrongName.cs | 2 +- .../v3}/ApplicationModeDecrypter.cs | 2 +- .../v3}/ApplicationModeUnpacker.cs | 2 +- .../v3}/AssemblyResolver.cs | 2 +- .../v3}/DecryptMethod.cs | 2 +- .../v3}/DecrypterType.cs | 2 +- .../v3}/Deobfuscator.cs | 2 +- .../v3}/MemoryPatcher.cs | 2 +- .../v3}/NativeLibSaver.cs | 2 +- .../v4}/AntiStrongname.cs | 2 +- .../v4}/AssemblyResolver.cs | 2 +- .../v4}/BoolValueInliner.cs | 2 +- .../v4}/BooleanDecrypter.cs | 2 +- .../v4}/Deobfuscator.cs | 2 +- .../v4}/EmptyClass.cs | 2 +- .../v4}/EncryptedResource.cs | 2 +- .../v4}/MetadataTokenObfuscator.cs | 2 +- .../v4}/MethodsDecrypter.cs | 2 +- .../v4}/NativeFileDecrypter.cs | 2 +- .../v4}/NativeImageUnpacker.cs | 2 +- .../v4}/ResourceResolver.cs | 2 +- .../v4}/StringDecrypter.cs | 2 +- de4dot.cui/Program.cs | 4 +- 24 files changed, 46 insertions(+), 46 deletions(-) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/AntiStrongName.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/ApplicationModeDecrypter.cs (97%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/ApplicationModeUnpacker.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/AssemblyResolver.cs (97%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/DecryptMethod.cs (97%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/DecrypterType.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/Deobfuscator.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/MemoryPatcher.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor3 => dotNET_Reactor/v3}/NativeLibSaver.cs (97%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/AntiStrongname.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/AssemblyResolver.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/BoolValueInliner.cs (97%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/BooleanDecrypter.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/Deobfuscator.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/EmptyClass.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/EncryptedResource.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/MetadataTokenObfuscator.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/MethodsDecrypter.cs (99%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/NativeFileDecrypter.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/NativeImageUnpacker.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/ResourceResolver.cs (98%) rename de4dot.code/deobfuscators/{dotNET_Reactor4 => dotNET_Reactor/v4}/StringDecrypter.cs (99%) diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj index 5a2e4f1e..db06a2cb 100644 --- a/de4dot.code/de4dot.code.csproj +++ b/de4dot.code/de4dot.code.csproj @@ -77,29 +77,29 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/AntiStrongName.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor3/AntiStrongName.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs index 3ca7103d..1dd4e9d9 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/AntiStrongName.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AntiStrongName.cs @@ -22,7 +22,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class AntiStrongName { public bool remove(Blocks blocks) { var allBlocks = blocks.MethodBlocks.getAllBlocks(); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs similarity index 97% rename from de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeDecrypter.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs index da2b3fdb..3cd7a242 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeDecrypter.cs @@ -21,7 +21,7 @@ using Mono.Cecil; using de4dot.blocks; using de4dot.blocks.cflow; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class ApplicationModeDecrypter { ModuleDefinition module; AssemblyResolver assemblyResolver; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeUnpacker.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs index dae79ce1..c7b7a65e 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/ApplicationModeUnpacker.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs @@ -25,7 +25,7 @@ using System.Text.RegularExpressions; using Mono.Cecil; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class IniFile { Dictionary nameToValue = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs similarity index 97% rename from de4dot.code/deobfuscators/dotNET_Reactor3/AssemblyResolver.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs index 0fb3ffc9..3501943c 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/AssemblyResolver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/AssemblyResolver.cs @@ -22,7 +22,7 @@ using Mono.Cecil; using de4dot.blocks; using de4dot.blocks.cflow; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class AssemblyResolver { DecryptMethod decryptMethod = new DecryptMethod(); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/DecryptMethod.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs similarity index 97% rename from de4dot.code/deobfuscators/dotNET_Reactor3/DecryptMethod.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs index 04ff59ac..f6c43b9b 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/DecryptMethod.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecryptMethod.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using Mono.Cecil; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class DecryptMethod { MethodDefinition decryptionMethod; byte[] key; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/DecrypterType.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor3/DecrypterType.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs index 335c2bcd..be2211fd 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/DecrypterType.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs @@ -24,7 +24,7 @@ using Mono.Cecil; using de4dot.blocks; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { // Find the type that decrypts strings and calls the native lib class DecrypterType { ModuleDefinition module; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor3/Deobfuscator.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs index 7ba6481e..212c438f 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs @@ -27,7 +27,7 @@ using Mono.MyStuff; using de4dot.blocks; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { public class DeobfuscatorInfo : DeobfuscatorInfoBase { public const string THE_NAME = ".NET Reactor"; public const string THE_TYPE = "dr3"; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/MemoryPatcher.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor3/MemoryPatcher.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs index 6ecf5595..ad181016 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/MemoryPatcher.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs @@ -26,7 +26,7 @@ using de4dot.blocks; using de4dot.blocks.cflow; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class MemoryPatcher { DecryptMethod decryptMethod = new DecryptMethod(); List patchInfos = new List(); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor3/NativeLibSaver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs similarity index 97% rename from de4dot.code/deobfuscators/dotNET_Reactor3/NativeLibSaver.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs index 7aafffc0..2edb28bf 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor3/NativeLibSaver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs @@ -21,7 +21,7 @@ using System; using Mono.Cecil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor3 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { // Finds the type that saves the native lib (if in resources) to disk class NativeLibSaver { ModuleDefinition module; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/AntiStrongname.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/AntiStrongname.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs index 51d09ef9..8e6f5514 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/AntiStrongname.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AntiStrongname.cs @@ -22,7 +22,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class AntiStrongName { TypeDefinition decrypterType; MethodDefinition antiStrongNameMethod; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/AssemblyResolver.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs index b66f13a1..077e98dc 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/AssemblyResolver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs @@ -23,7 +23,7 @@ using System.IO; using Mono.Cecil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class ResourceInfo { public EmbeddedResource resource; public string name; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/BoolValueInliner.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BoolValueInliner.cs similarity index 97% rename from de4dot.code/deobfuscators/dotNET_Reactor4/BoolValueInliner.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/BoolValueInliner.cs index 18401a8f..7b688be2 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/BoolValueInliner.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BoolValueInliner.cs @@ -22,7 +22,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class BoolValueInliner : MethodReturnValueInliner { Dictionary> boolDecrypters = new Dictionary>(); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/BooleanDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/BooleanDecrypter.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs index b4b8f9bb..83c42ae7 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/BooleanDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/BooleanDecrypter.cs @@ -21,7 +21,7 @@ using System; using Mono.Cecil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class BooleanDecrypter { ModuleDefinition module; EncryptedResource encryptedResource; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/Deobfuscator.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs index c4656643..1cbf45b8 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs @@ -27,7 +27,7 @@ using Mono.MyStuff; using de4dot.blocks; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { public class DeobfuscatorInfo : DeobfuscatorInfoBase { public const string THE_NAME = ".NET Reactor"; public const string THE_TYPE = "dr4"; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/EmptyClass.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/EmptyClass.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs index 89ed9cdd..56bde545 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/EmptyClass.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EmptyClass.cs @@ -20,7 +20,7 @@ using Mono.Cecil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { // Detect some empty class that is called from most .ctor's class EmptyClass { ModuleDefinition module; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/EncryptedResource.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/EncryptedResource.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs index 40b3b20a..b5b8c3d0 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/EncryptedResource.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs @@ -25,7 +25,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class EncryptedResource { ModuleDefinition module; MethodDefinition resourceDecrypterMethod; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/MetadataTokenObfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/MetadataTokenObfuscator.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs index c4fe7489..d73543ac 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/MetadataTokenObfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MetadataTokenObfuscator.cs @@ -21,7 +21,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { // Find the class that returns a RuntimeTypeHandle/RuntimeFieldHandle. The value passed to // its methods is the original metadata token, which will be different when we save the file. class MetadataTokenObfuscator { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/MethodsDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/MethodsDecrypter.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs index 0c30b220..2e815720 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs @@ -26,7 +26,7 @@ using Mono.MyStuff; using de4dot.blocks; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class MethodsDecrypter { ModuleDefinition module; EncryptedResource encryptedResource; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/NativeFileDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeFileDecrypter.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/NativeFileDecrypter.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeFileDecrypter.cs index 6e174e63..ffba3ad5 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/NativeFileDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeFileDecrypter.cs @@ -19,7 +19,7 @@ using System; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class NativeFileDecrypter { byte[] key; byte kb = 0; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/NativeImageUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/NativeImageUnpacker.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs index ee103df1..1d424bfc 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/NativeImageUnpacker.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs @@ -22,7 +22,7 @@ using System.IO; using ICSharpCode.SharpZipLib.Zip.Compression; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class NativeImageUnpacker { PeImage peImage; bool isNet1x; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/ResourceResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs similarity index 98% rename from de4dot.code/deobfuscators/dotNET_Reactor4/ResourceResolver.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs index fb40bcd3..f35826e4 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/ResourceResolver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs @@ -23,7 +23,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class ResourceResolver { ModuleDefinition module; EncryptedResource encryptedResource; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor4/StringDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs similarity index 99% rename from de4dot.code/deobfuscators/dotNET_Reactor4/StringDecrypter.cs rename to de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs index d352f9ff..d726548e 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor4/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs @@ -26,7 +26,7 @@ using Mono.Cecil.Cil; using de4dot.blocks; using de4dot.code.PE; -namespace de4dot.code.deobfuscators.dotNET_Reactor4 { +namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class StringDecrypter { ModuleDefinition module; EncryptedResource encryptedResource; diff --git a/de4dot.cui/Program.cs b/de4dot.cui/Program.cs index acd3c326..98a8ec6d 100644 --- a/de4dot.cui/Program.cs +++ b/de4dot.cui/Program.cs @@ -33,8 +33,8 @@ namespace de4dot.cui { new de4dot.code.deobfuscators.CliSecure.DeobfuscatorInfo(), new de4dot.code.deobfuscators.CryptoObfuscator.DeobfuscatorInfo(), new de4dot.code.deobfuscators.Dotfuscator.DeobfuscatorInfo(), - new de4dot.code.deobfuscators.dotNET_Reactor3.DeobfuscatorInfo(), - new de4dot.code.deobfuscators.dotNET_Reactor4.DeobfuscatorInfo(), + new de4dot.code.deobfuscators.dotNET_Reactor.v3.DeobfuscatorInfo(), + new de4dot.code.deobfuscators.dotNET_Reactor.v4.DeobfuscatorInfo(), new de4dot.code.deobfuscators.Eazfuscator.DeobfuscatorInfo(), new de4dot.code.deobfuscators.SmartAssembly.DeobfuscatorInfo(), new de4dot.code.deobfuscators.Xenocode.DeobfuscatorInfo(),