From c756d543c13423287d47f1561165a12faf4661c1 Mon Sep 17 00:00:00 2001 From: de4dot Date: Tue, 10 Apr 2012 16:32:15 +0200 Subject: [PATCH] Rename PE namespace --- blocks/PE/Cor20Header.cs | 2 +- blocks/PE/DataDirectory.cs | 2 +- blocks/PE/DotNetStream.cs | 2 +- blocks/PE/FileHeader.cs | 2 +- blocks/PE/IFileLocation.cs | 2 +- blocks/PE/Metadata.cs | 2 +- blocks/PE/MetadataTables.cs | 2 +- blocks/PE/MetadataType.cs | 2 +- blocks/PE/MetadataTypeBuilder.cs | 2 +- blocks/PE/OptionalHeader.cs | 2 +- blocks/PE/PeImage.cs | 2 +- blocks/PE/ResourceData.cs | 2 +- blocks/PE/ResourceDirectory.cs | 2 +- blocks/PE/ResourceDirectoryEntry.cs | 2 +- blocks/PE/Resources.cs | 2 +- blocks/PE/SectionHeader.cs | 2 +- de4dot.code/ObfuscatedFile.cs | 2 +- de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs | 2 +- de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs | 4 ++-- de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs | 2 +- de4dot.code/deobfuscators/DeobfuscatorBase.cs | 2 +- de4dot.code/deobfuscators/IDeobfuscator.cs | 2 +- de4dot.code/deobfuscators/MaxtoCode/FileDecrypter.cs | 2 +- .../dotNET_Reactor/v3/ApplicationModeUnpacker.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs | 2 +- .../deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs | 4 ++-- .../deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs | 2 +- .../deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs | 2 +- de4dot.mdecrypt/DynamicMethodsDecrypter.cs | 4 ++-- 32 files changed, 35 insertions(+), 35 deletions(-) diff --git a/blocks/PE/Cor20Header.cs b/blocks/PE/Cor20Header.cs index 250357c8..50942cb7 100644 --- a/blocks/PE/Cor20Header.cs +++ b/blocks/PE/Cor20Header.cs @@ -19,7 +19,7 @@ using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public class Cor20Header : IFileLocation { public uint cb; public ushort majorRuntimeVersion; diff --git a/blocks/PE/DataDirectory.cs b/blocks/PE/DataDirectory.cs index a470e717..7832340d 100644 --- a/blocks/PE/DataDirectory.cs +++ b/blocks/PE/DataDirectory.cs @@ -19,7 +19,7 @@ using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public struct DataDirectory { public uint virtualAddress; public uint size; diff --git a/blocks/PE/DotNetStream.cs b/blocks/PE/DotNetStream.cs index bd40efe7..cb8840ff 100644 --- a/blocks/PE/DotNetStream.cs +++ b/blocks/PE/DotNetStream.cs @@ -19,7 +19,7 @@ using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public class DotNetStream : IFileLocation { public string name; public uint fileOffset; diff --git a/blocks/PE/FileHeader.cs b/blocks/PE/FileHeader.cs index ee28b5ae..54466f65 100644 --- a/blocks/PE/FileHeader.cs +++ b/blocks/PE/FileHeader.cs @@ -19,7 +19,7 @@ using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public enum Machine : ushort { i386 = 0x14C, ia64 = 0x200, diff --git a/blocks/PE/IFileLocation.cs b/blocks/PE/IFileLocation.cs index b5c239fe..ed951437 100644 --- a/blocks/PE/IFileLocation.cs +++ b/blocks/PE/IFileLocation.cs @@ -17,7 +17,7 @@ along with de4dot. If not, see . */ -namespace de4dot.code.PE { +namespace de4dot.PE { public interface IFileLocation { uint Offset { get; } uint Length { get; } diff --git a/blocks/PE/Metadata.cs b/blocks/PE/Metadata.cs index 23947ecb..9d1e9431 100644 --- a/blocks/PE/Metadata.cs +++ b/blocks/PE/Metadata.cs @@ -21,7 +21,7 @@ using System; using System.IO; using System.Text; -namespace de4dot.code.PE { +namespace de4dot.PE { public class Metadata : IFileLocation { uint magic; ushort majorVersion, minorVersion; diff --git a/blocks/PE/MetadataTables.cs b/blocks/PE/MetadataTables.cs index 47e24a31..2c877ce2 100644 --- a/blocks/PE/MetadataTables.cs +++ b/blocks/PE/MetadataTables.cs @@ -20,7 +20,7 @@ using System; using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { using MVT = MetadataVarType; public class MetadataTables { diff --git a/blocks/PE/MetadataType.cs b/blocks/PE/MetadataType.cs index 4fffe34f..19704a0e 100644 --- a/blocks/PE/MetadataType.cs +++ b/blocks/PE/MetadataType.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; -namespace de4dot.code.PE { +namespace de4dot.PE { public enum MetadataIndex { iModule = 0, iTypeRef = 1, diff --git a/blocks/PE/MetadataTypeBuilder.cs b/blocks/PE/MetadataTypeBuilder.cs index 7060f6ba..9b7b1a3b 100644 --- a/blocks/PE/MetadataTypeBuilder.cs +++ b/blocks/PE/MetadataTypeBuilder.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; -namespace de4dot.code.PE { +namespace de4dot.PE { enum MetadataVarType { end, stop, diff --git a/blocks/PE/OptionalHeader.cs b/blocks/PE/OptionalHeader.cs index 37c4833d..f70ba928 100644 --- a/blocks/PE/OptionalHeader.cs +++ b/blocks/PE/OptionalHeader.cs @@ -19,7 +19,7 @@ using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public class OptionalHeader : IFileLocation { public ushort magic; public byte majorLinkerVersion; diff --git a/blocks/PE/PeImage.cs b/blocks/PE/PeImage.cs index 3eec0b27..bcffc64c 100644 --- a/blocks/PE/PeImage.cs +++ b/blocks/PE/PeImage.cs @@ -20,7 +20,7 @@ using System; using System.IO; -namespace de4dot.code.PE { +namespace de4dot.PE { public class PeImage { BinaryReader reader; BinaryWriter writer; diff --git a/blocks/PE/ResourceData.cs b/blocks/PE/ResourceData.cs index bc1ce8db..e61f92b1 100644 --- a/blocks/PE/ResourceData.cs +++ b/blocks/PE/ResourceData.cs @@ -17,7 +17,7 @@ along with de4dot. If not, see . */ -namespace de4dot.code.PE { +namespace de4dot.PE { public class ResourceData : ResourceDirectoryEntry { uint rva; uint size; diff --git a/blocks/PE/ResourceDirectory.cs b/blocks/PE/ResourceDirectory.cs index 559a99b6..e24ae90a 100644 --- a/blocks/PE/ResourceDirectory.cs +++ b/blocks/PE/ResourceDirectory.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; -namespace de4dot.code.PE { +namespace de4dot.PE { public class ResourceDirectory : ResourceDirectoryEntry { Resources resources; int offset; diff --git a/blocks/PE/ResourceDirectoryEntry.cs b/blocks/PE/ResourceDirectoryEntry.cs index 9742406f..2d669005 100644 --- a/blocks/PE/ResourceDirectoryEntry.cs +++ b/blocks/PE/ResourceDirectoryEntry.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; -namespace de4dot.code.PE { +namespace de4dot.PE { public abstract class ResourceDirectoryEntry { protected readonly string name; protected readonly int id; diff --git a/blocks/PE/Resources.cs b/blocks/PE/Resources.cs index 4298388e..a59d4c2e 100644 --- a/blocks/PE/Resources.cs +++ b/blocks/PE/Resources.cs @@ -20,7 +20,7 @@ using System.IO; using System.Text; -namespace de4dot.code.PE { +namespace de4dot.PE { public class Resources { BinaryReader reader; uint startOffset; diff --git a/blocks/PE/SectionHeader.cs b/blocks/PE/SectionHeader.cs index aa47ba99..653abd47 100644 --- a/blocks/PE/SectionHeader.cs +++ b/blocks/PE/SectionHeader.cs @@ -20,7 +20,7 @@ using System.IO; using System.Text; -namespace de4dot.code.PE { +namespace de4dot.PE { public class SectionHeader : IFileLocation { public byte[] name; public uint virtualSize; diff --git a/de4dot.code/ObfuscatedFile.cs b/de4dot.code/ObfuscatedFile.cs index c74e8b9c..fe21f169 100644 --- a/de4dot.code/ObfuscatedFile.cs +++ b/de4dot.code/ObfuscatedFile.cs @@ -30,7 +30,7 @@ using de4dot.blocks; using de4dot.blocks.cflow; using de4dot.code.AssemblyClient; using de4dot.code.renamer; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code { public class ObfuscatedFile : IObfuscatedFile, IDeobfuscatedFile { diff --git a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs index bf2f3241..96c26759 100644 --- a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using Mono.Cecil; using Mono.MyStuff; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.CliSecure { public class DeobfuscatorInfo : DeobfuscatorInfoBase { diff --git a/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs index 0cf3974f..bdaddfe4 100644 --- a/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs @@ -20,7 +20,7 @@ using System; using System.Collections.Generic; using Mono.MyStuff; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.CliSecure { class CodeHeader { @@ -163,7 +163,7 @@ namespace de4dot.code.deobfuscators.CliSecure { return false; var metadataTables = peImage.Cor20Header.createMetadataTables(); - var methodDefTable = metadataTables.getMetadataType(PE.MetadataIndex.iMethodDef); + var methodDefTable = metadataTables.getMetadataType(MetadataIndex.iMethodDef); if (methodDefTable.totalSize != codeHeader.methodDefElemSize) return false; diff --git a/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs index a8ffccfb..9ae6f07f 100644 --- a/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/CodeVeil/MethodsDecrypter.cs @@ -25,7 +25,7 @@ using Mono.Cecil.Cil; using Mono.Cecil.Metadata; using Mono.MyStuff; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.CodeVeil { class MethodsDecrypter { diff --git a/de4dot.code/deobfuscators/DeobfuscatorBase.cs b/de4dot.code/deobfuscators/DeobfuscatorBase.cs index 5cd27c9b..2392c995 100644 --- a/de4dot.code/deobfuscators/DeobfuscatorBase.cs +++ b/de4dot.code/deobfuscators/DeobfuscatorBase.cs @@ -24,7 +24,7 @@ using Mono.Cecil.Cil; using Mono.MyStuff; using de4dot.blocks; using de4dot.blocks.cflow; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators { abstract class DeobfuscatorBase : IDeobfuscator, IWriterListener { diff --git a/de4dot.code/deobfuscators/IDeobfuscator.cs b/de4dot.code/deobfuscators/IDeobfuscator.cs index 21b2b882..848f4913 100644 --- a/de4dot.code/deobfuscators/IDeobfuscator.cs +++ b/de4dot.code/deobfuscators/IDeobfuscator.cs @@ -24,7 +24,7 @@ using Mono.MyStuff; using de4dot.blocks; using de4dot.blocks.cflow; using de4dot.code.renamer; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators { public interface IDeobfuscatorOptions { diff --git a/de4dot.code/deobfuscators/MaxtoCode/FileDecrypter.cs b/de4dot.code/deobfuscators/MaxtoCode/FileDecrypter.cs index 4ededf36..3251b78c 100644 --- a/de4dot.code/deobfuscators/MaxtoCode/FileDecrypter.cs +++ b/de4dot.code/deobfuscators/MaxtoCode/FileDecrypter.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.IO; using System.Text; using Mono.MyStuff; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.MaxtoCode { // Decrypts methods and resources diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs index 423f9981..3bf94291 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs @@ -23,7 +23,7 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; using Mono.Cecil; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class IniFile { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs index 1bdc0ffb..0e49d91b 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Text; using Mono.Cecil; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { // Find the type that decrypts strings and calls the native lib diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs index 55e9931b..cca460a4 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs @@ -25,7 +25,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using Mono.MyStuff; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { public class DeobfuscatorInfo : DeobfuscatorInfoBase { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs index 324b577c..ab459b16 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs @@ -23,7 +23,7 @@ using System.IO; using Mono.Cecil; using de4dot.blocks; using de4dot.blocks.cflow; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { class MemoryPatcher { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs index 6a350042..a72ee466 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs @@ -25,7 +25,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using Mono.MyStuff; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { public class DeobfuscatorInfo : DeobfuscatorInfoBase { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs index 8de2f0da..de992d52 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/MethodsDecrypter.cs @@ -24,7 +24,7 @@ using Mono.Cecil; using Mono.Cecil.Cil; using Mono.MyStuff; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class MethodsDecrypter { @@ -170,7 +170,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { // DNR 4.0 - 4.4 (jitter is hooked) var metadataTables = peImage.Cor20Header.createMetadataTables(); - var methodDef = metadataTables.getMetadataType(PE.MetadataIndex.iMethodDef); + var methodDef = metadataTables.getMetadataType(MetadataIndex.iMethodDef); var rvaToIndex = new Dictionary((int)methodDef.rows); uint offset = methodDef.fileOffset; for (int i = 0; i < methodDef.rows; i++) { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs index 3b7f7116..28b90eaa 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/NativeImageUnpacker.cs @@ -20,7 +20,7 @@ using System; using System.IO; using ICSharpCode.SharpZipLib.Zip.Compression; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class NativeImageUnpacker { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs index 750c2dc6..50a4269c 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; using Mono.Cecil; using Mono.Cecil.Cil; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { class StringDecrypter { diff --git a/de4dot.mdecrypt/DynamicMethodsDecrypter.cs b/de4dot.mdecrypt/DynamicMethodsDecrypter.cs index e3328e77..7590af40 100644 --- a/de4dot.mdecrypt/DynamicMethodsDecrypter.cs +++ b/de4dot.mdecrypt/DynamicMethodsDecrypter.cs @@ -25,7 +25,7 @@ using System.Reflection; using Mono.MyStuff; using Mono.Cecil; using de4dot.blocks; -using de4dot.code.PE; +using de4dot.PE; namespace de4dot.mdecrypt { public class DynamicMethodsDecrypter { @@ -90,7 +90,7 @@ namespace de4dot.mdecrypt { IntPtr ourCompMem; bool compileMethodIsThisCall; - de4dot.code.PE.MetadataType methodDefTable; + de4dot.PE.MetadataType methodDefTable; IntPtr methodDefTablePtr; ModuleDefinition monoModule; MethodDefinition moduleCctor;