diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj index a164c1cd..0e8b1e9d 100644 --- a/de4dot.code/de4dot.code.csproj +++ b/de4dot.code/de4dot.code.csproj @@ -57,6 +57,25 @@ + + + + + + + + + + + + + + + + + + + @@ -74,25 +93,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/de4dot.code/deobfuscators/CliSecure/CliSecureRtType.cs b/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/CliSecureRtType.cs rename to de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs index f894fbc7..0a712abb 100644 --- a/de4dot.code/deobfuscators/CliSecure/CliSecureRtType.cs +++ b/de4dot.code/deobfuscators/Agile_NET/CliSecureRtType.cs @@ -24,7 +24,7 @@ using dot10.DotNet; using de4dot.blocks; using de4dot.PE; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class CliSecureRtType { ModuleDefinition module; TypeDef cliSecureRtType; diff --git a/de4dot.code/deobfuscators/CliSecure/CsBlowfish.cs b/de4dot.code/deobfuscators/Agile_NET/CsBlowfish.cs similarity index 96% rename from de4dot.code/deobfuscators/CliSecure/CsBlowfish.cs rename to de4dot.code/deobfuscators/Agile_NET/CsBlowfish.cs index 75cd72e0..9f5b06c1 100644 --- a/de4dot.code/deobfuscators/CliSecure/CsBlowfish.cs +++ b/de4dot.code/deobfuscators/Agile_NET/CsBlowfish.cs @@ -17,7 +17,7 @@ along with de4dot. If not, see . */ -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class CsBlowfish : Blowfish { public CsBlowfish() { } diff --git a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs rename to de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs index 18ce06f8..52af594e 100644 --- a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs @@ -24,7 +24,7 @@ using Mono.MyStuff; using de4dot.blocks; using de4dot.PE; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { public class DeobfuscatorInfo : DeobfuscatorInfoBase { public const string THE_NAME = "CliSecure"; public const string THE_TYPE = "cs"; diff --git a/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs rename to de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs index 6134f638..abe05d3c 100644 --- a/de4dot.code/deobfuscators/CliSecure/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/Agile_NET/MethodsDecrypter.cs @@ -24,7 +24,7 @@ using Mono.MyStuff; using de4dot.PE; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class CodeHeader { public byte[] signature; public byte[] decryptionKey; diff --git a/de4dot.code/deobfuscators/CliSecure/ProxyCallFixer.cs b/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/ProxyCallFixer.cs rename to de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs index 9ad5f4ec..1883e78f 100644 --- a/de4dot.code/deobfuscators/CliSecure/ProxyCallFixer.cs +++ b/de4dot.code/deobfuscators/Agile_NET/ProxyCallFixer.cs @@ -23,7 +23,7 @@ using dot10.DotNet; using dot10.DotNet.Emit; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class ProxyCallFixer : ProxyCallFixer1 { IList memberReferences; diff --git a/de4dot.code/deobfuscators/CliSecure/ResourceDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/ResourceDecrypter.cs rename to de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs index aeb2f34c..9f4b5166 100644 --- a/de4dot.code/deobfuscators/CliSecure/ResourceDecrypter.cs +++ b/de4dot.code/deobfuscators/Agile_NET/ResourceDecrypter.cs @@ -23,7 +23,7 @@ using System.Text; using dot10.DotNet; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class ResourceDecrypter { ModuleDefinition module; TypeDef rsrcType; diff --git a/de4dot.code/deobfuscators/CliSecure/StackFrameHelper.cs b/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/StackFrameHelper.cs rename to de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs index 76d760dd..f4ef0696 100644 --- a/de4dot.code/deobfuscators/CliSecure/StackFrameHelper.cs +++ b/de4dot.code/deobfuscators/Agile_NET/StackFrameHelper.cs @@ -21,7 +21,7 @@ using System; using dot10.DotNet; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class StackFrameHelper { ModuleDefinition module; TypeDef stackFrameHelperType; diff --git a/de4dot.code/deobfuscators/CliSecure/StringDecrypter.cs b/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/StringDecrypter.cs rename to de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs index b8bbd156..1d67c966 100644 --- a/de4dot.code/deobfuscators/CliSecure/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/Agile_NET/StringDecrypter.cs @@ -21,7 +21,7 @@ using System; using System.Text; using dot10.DotNet; -namespace de4dot.code.deobfuscators.CliSecure { +namespace de4dot.code.deobfuscators.Agile_NET { class StringDecrypter { ModuleDefinition module; TypeDef stringDecrypterType; diff --git a/de4dot.code/deobfuscators/CliSecure/vm/CilOperandInstructionRestorer.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/vm/CilOperandInstructionRestorer.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs index 32d770a1..65465f7a 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/CilOperandInstructionRestorer.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/CilOperandInstructionRestorer.cs @@ -22,7 +22,7 @@ using dot10.DotNet.Emit; using Mono.Cecil.Metadata; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { // Tries to restore the operands of the following CIL instructions: // ldelema // ldobj diff --git a/de4dot.code/deobfuscators/CliSecure/vm/Csvm.cs b/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/vm/Csvm.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs index 7f4f7755..44bbe92f 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/Csvm.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs @@ -23,7 +23,7 @@ using System.IO; using dot10.DotNet; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class Csvm { IDeobfuscatorContext deobfuscatorContext; ModuleDefinition module; diff --git a/de4dot.code/deobfuscators/CliSecure/vm/CsvmDataReader.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs similarity index 96% rename from de4dot.code/deobfuscators/CliSecure/vm/CsvmDataReader.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs index b6bd7915..1efea978 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/CsvmDataReader.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmDataReader.cs @@ -23,7 +23,7 @@ using System.IO; using dot10.DotNet; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class CsvmDataReader { BinaryReader reader; diff --git a/de4dot.code/deobfuscators/CliSecure/vm/CsvmMethodData.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmMethodData.cs similarity index 95% rename from de4dot.code/deobfuscators/CliSecure/vm/CsvmMethodData.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/CsvmMethodData.cs index a476c00d..311b41f8 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/CsvmMethodData.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmMethodData.cs @@ -19,7 +19,7 @@ using System; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class CsvmMethodData { public Guid Guid { get; set; } public int Token { get; set; } diff --git a/de4dot.code/deobfuscators/CliSecure/vm/CsvmToCilMethodConverter.cs b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/vm/CsvmToCilMethodConverter.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs index 2ea5a91f..227bb866 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/CsvmToCilMethodConverter.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/CsvmToCilMethodConverter.cs @@ -25,7 +25,7 @@ using dot10.DotNet.Emit; using Mono.Cecil.Metadata; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class CsvmToCilMethodConverter { IDeobfuscatorContext deobfuscatorContext; ModuleDefinition module; diff --git a/de4dot.code/deobfuscators/CliSecure/vm/FieldsInfo.cs b/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs similarity index 97% rename from de4dot.code/deobfuscators/CliSecure/vm/FieldsInfo.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs index 7dbc409e..cb96c93b 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/FieldsInfo.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/FieldsInfo.cs @@ -21,7 +21,7 @@ using System; using System.Collections.Generic; using dot10.DotNet; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class FieldsInfo { public static readonly object EnumType = new object(); Dictionary fieldTypes = new Dictionary(StringComparer.Ordinal); diff --git a/de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandler.cs b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandler.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs index e8d5e49e..016d51eb 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandler.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandler.cs @@ -25,7 +25,7 @@ using dot10.DotNet; using dot10.DotNet.Emit; using Mono.Cecil.Metadata; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { partial class OpCodeHandler { public string Name { get; set; } public OpCodeHandlerSigInfo OpCodeHandlerSigInfo { get; set; } diff --git a/de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandlers.cs b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandlers.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandlers.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandlers.cs index 3dc0eba0..48199216 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/OpCodeHandlers.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/OpCodeHandlers.cs @@ -17,7 +17,7 @@ along with de4dot. If not, see . */ -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { static partial class OpCodeHandlers { public static readonly OpCodeHandler[][] opcodeHandlers = new OpCodeHandler[][] { new OpCodeHandler[] { diff --git a/de4dot.code/deobfuscators/CliSecure/vm/UnknownHandlerInfo.cs b/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs similarity index 98% rename from de4dot.code/deobfuscators/CliSecure/vm/UnknownHandlerInfo.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs index 40d9a24e..ac2127a0 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/UnknownHandlerInfo.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/UnknownHandlerInfo.cs @@ -23,7 +23,7 @@ using dot10.DotNet; using dot10.DotNet.Emit; using de4dot.blocks; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class UnknownHandlerInfo { TypeDef type; CsvmInfo csvmInfo; diff --git a/de4dot.code/deobfuscators/CliSecure/vm/VmOpCodeHandlerDetector.cs b/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs similarity index 99% rename from de4dot.code/deobfuscators/CliSecure/vm/VmOpCodeHandlerDetector.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs index db9d3e5a..6b556be2 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/VmOpCodeHandlerDetector.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/VmOpCodeHandlerDetector.cs @@ -24,7 +24,7 @@ using dot10.DotNet.Emit; using de4dot.blocks; using de4dot.blocks.cflow; -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { class OpCodeHandlerSigInfo { public object[] RequiredFieldTypes { get; set; } public string[] ExecuteMethodLocals { get; set; } diff --git a/de4dot.code/deobfuscators/CliSecure/vm/VmOperands.cs b/de4dot.code/deobfuscators/Agile_NET/vm/VmOperands.cs similarity index 97% rename from de4dot.code/deobfuscators/CliSecure/vm/VmOperands.cs rename to de4dot.code/deobfuscators/Agile_NET/vm/VmOperands.cs index 4d6d45cd..4e1e122d 100644 --- a/de4dot.code/deobfuscators/CliSecure/vm/VmOperands.cs +++ b/de4dot.code/deobfuscators/Agile_NET/vm/VmOperands.cs @@ -17,7 +17,7 @@ along with de4dot. If not, see . */ -namespace de4dot.code.deobfuscators.CliSecure.vm { +namespace de4dot.code.deobfuscators.Agile_NET.vm { interface IVmOperand { } diff --git a/de4dot.cui/Program.cs b/de4dot.cui/Program.cs index 39674a5d..6ec5bcc2 100644 --- a/de4dot.cui/Program.cs +++ b/de4dot.cui/Program.cs @@ -39,7 +39,7 @@ namespace de4dot.cui { new de4dot.code.deobfuscators.Unknown.DeobfuscatorInfo(), #if PORT new de4dot.code.deobfuscators.Babel_NET.DeobfuscatorInfo(), - new de4dot.code.deobfuscators.CliSecure.DeobfuscatorInfo(), + new de4dot.code.deobfuscators.Agile_NET.DeobfuscatorInfo(), new de4dot.code.deobfuscators.CodeFort.DeobfuscatorInfo(), new de4dot.code.deobfuscators.CodeVeil.DeobfuscatorInfo(), new de4dot.code.deobfuscators.CodeWall.DeobfuscatorInfo(),