From 001b67804f6651394e52298a61efb9f8557bb8ef Mon Sep 17 00:00:00 2001 From: de4dot Date: Tue, 6 Nov 2012 22:25:19 +0100 Subject: [PATCH] Move DumpedMethod{,s} to de4dot.blocks namespace --- AssemblyData/AssemblyService.cs | 1 + AssemblyData/IAssemblyService.cs | 1 + blocks/DumpedMethod.cs | 4 +--- blocks/DumpedMethods.cs | 5 ++--- de4dot.code/deobfuscators/MethodsDecrypter.cs | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AssemblyData/AssemblyService.cs b/AssemblyData/AssemblyService.cs index ed059fc0..421a0331 100644 --- a/AssemblyData/AssemblyService.cs +++ b/AssemblyData/AssemblyService.cs @@ -22,6 +22,7 @@ using System.Collections.Generic; using System.Reflection; using System.Threading; using dot10.DotNet; +using de4dot.blocks; using de4dot.mdecrypt; namespace AssemblyData { diff --git a/AssemblyData/IAssemblyService.cs b/AssemblyData/IAssemblyService.cs index f264fc95..41d01fc6 100644 --- a/AssemblyData/IAssemblyService.cs +++ b/AssemblyData/IAssemblyService.cs @@ -18,6 +18,7 @@ */ using dot10.DotNet; +using de4dot.blocks; using de4dot.mdecrypt; namespace AssemblyData { diff --git a/blocks/DumpedMethod.cs b/blocks/DumpedMethod.cs index 3d768859..a8977e01 100644 --- a/blocks/DumpedMethod.cs +++ b/blocks/DumpedMethod.cs @@ -17,11 +17,9 @@ along with de4dot. If not, see . */ -//TODO: DumpedMethods and DumpedMethod should be moved to dot10 - using System; -namespace dot10.DotNet { +namespace de4dot.blocks { [Serializable] public class DumpedMethod { public ushort mhFlags; // method header Flags diff --git a/blocks/DumpedMethods.cs b/blocks/DumpedMethods.cs index fe70ccf8..1b78bd2c 100644 --- a/blocks/DumpedMethods.cs +++ b/blocks/DumpedMethods.cs @@ -17,13 +17,12 @@ along with de4dot. If not, see . */ -//TODO: DumpedMethods and DumpedMethod should be moved to dot10 - using System; using System.Collections.Generic; using dot10.DotNet.MD; +using dot10.DotNet; -namespace dot10.DotNet { +namespace de4dot.blocks { public interface IStringDecrypter { string decrypt(uint token); } diff --git a/de4dot.code/deobfuscators/MethodsDecrypter.cs b/de4dot.code/deobfuscators/MethodsDecrypter.cs index 7267a356..8c520f54 100644 --- a/de4dot.code/deobfuscators/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/MethodsDecrypter.cs @@ -19,6 +19,7 @@ using dot10.DotNet; using de4dot.code.AssemblyClient; +using de4dot.blocks; using de4dot.mdecrypt; namespace de4dot.code.deobfuscators {