Move DNR v3 and v4 code to a DNR sub dir

This commit is contained in:
de4dot 2011-12-21 18:55:36 +01:00
parent 03ff9a61cb
commit f87fabd6aa
24 changed files with 46 additions and 46 deletions

View File

@ -77,29 +77,29 @@
<Compile Include="deobfuscators\DeobfuscatorInfoBase.cs" />
<Compile Include="deobfuscators\DeobUtils.cs" />
<Compile Include="deobfuscators\Dotfuscator\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\AntiStrongName.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\ApplicationModeDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\ApplicationModeUnpacker.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\DecrypterType.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\NativeLibSaver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\AssemblyResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\BooleanDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\BoolValueInliner.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\EmptyClass.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\EncryptedResource.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\MetadataTokenObfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\MethodsDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\NativeFileDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\NativeImageUnpacker.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\AntiStrongName.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeUnpacker.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\DecrypterType.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\NativeLibSaver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\AssemblyResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\BooleanDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\BoolValueInliner.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\Deobfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\EmptyClass.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\EncryptedResource.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\MetadataTokenObfuscator.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\MethodsDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\NativeFileDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\NativeImageUnpacker.cs" />
<Compile Include="deobfuscators\QuickLZ.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\ResourceResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\StringDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor4\AntiStrongName.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\AssemblyResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\DecryptMethod.cs" />
<Compile Include="deobfuscators\dotNET_Reactor3\MemoryPatcher.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\ResourceResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\StringDecrypter.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v4\AntiStrongName.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\AssemblyResolver.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\DecryptMethod.cs" />
<Compile Include="deobfuscators\dotNET_Reactor\v3\MemoryPatcher.cs" />
<Compile Include="deobfuscators\Eazfuscator\Deobfuscator.cs" />
<Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
<Compile Include="deobfuscators\IDeobfuscatedFile.cs" />

View File

@ -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();

View File

@ -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;

View File

@ -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<string, string> nameToValue = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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";

View File

@ -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<PatchInfo> patchInfos = new List<PatchInfo>();

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<MethodReferenceAndDeclaringTypeKey, Func<MethodDefinition, object[], bool>> boolDecrypters = new Dictionary<MethodReferenceAndDeclaringTypeKey, Func<MethodDefinition, object[], bool>>();

View File

@ -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;

View File

@ -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";

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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(),