From 7f5401625ebd59ce68b7356c7b5da102041a2e22 Mon Sep 17 00:00:00 2001 From: de4dot Date: Thu, 19 Jan 2012 19:16:44 +0100 Subject: [PATCH] Rename classes --- de4dot.code/ObfuscatedFile.cs | 18 +++++++++--------- .../{StringDecrypter.cs => StringInliner.cs} | 8 ++++---- de4dot.code/de4dot.code.csproj | 2 +- .../deobfuscators/CliSecure/Deobfuscator.cs | 2 +- .../CryptoObfuscator/Deobfuscator.cs | 2 +- de4dot.code/deobfuscators/DeobfuscatorBase.cs | 4 ++-- .../deobfuscators/Dotfuscator/Deobfuscator.cs | 2 +- .../SmartAssembly/Deobfuscator.cs | 6 +++--- .../deobfuscators/Xenocode/Deobfuscator.cs | 2 +- .../dotNET_Reactor/v3/Deobfuscator.cs | 4 ++-- .../dotNET_Reactor/v4/Deobfuscator.cs | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) rename de4dot.code/{StringDecrypter.cs => StringInliner.cs} (96%) diff --git a/de4dot.code/ObfuscatedFile.cs b/de4dot.code/ObfuscatedFile.cs index 63db56b9..f16970b3 100644 --- a/de4dot.code/ObfuscatedFile.cs +++ b/de4dot.code/ObfuscatedFile.cs @@ -40,7 +40,7 @@ namespace de4dot.code { IDeobfuscator deob; AssemblyModule assemblyModule; IAssemblyClient assemblyClient; - DynamicStringDecrypter dynamicStringDecrypter; + DynamicStringInliner dynamicStringInliner; IAssemblyClientFactory assemblyClientFactory; SavedMethodBodies savedMethodBodies; bool userStringDecrypterMethods = false; @@ -380,7 +380,7 @@ namespace de4dot.code { deob = deob.moduleReloaded(module); initializeDeobfuscator(); deob.DeobfuscatedFile = this; - updateDynamicStringDecrypter(); + updateDynamicStringInliner(); } void initAssemblyClient() { @@ -397,13 +397,13 @@ namespace de4dot.code { else throw new ApplicationException(string.Format("Invalid string decrypter type '{0}'", options.StringDecrypterType)); - dynamicStringDecrypter = new DynamicStringDecrypter(assemblyClient); - updateDynamicStringDecrypter(); + dynamicStringInliner = new DynamicStringInliner(assemblyClient); + updateDynamicStringInliner(); } - void updateDynamicStringDecrypter() { - if (dynamicStringDecrypter != null) - dynamicStringDecrypter.init(getMethodTokens()); + void updateDynamicStringInliner() { + if (dynamicStringInliner != null) + dynamicStringInliner.init(getMethodTokens()); } IEnumerable getMethodTokens() { @@ -805,7 +805,7 @@ namespace de4dot.code { case DecrypterType.Delegate: case DecrypterType.Emulate: - dynamicStringDecrypter.decrypt(blocks); + dynamicStringInliner.decrypt(blocks); break; default: @@ -915,7 +915,7 @@ namespace de4dot.code { } void IDeobfuscatedFile.stringDecryptersAdded() { - updateDynamicStringDecrypter(); + updateDynamicStringInliner(); } } } diff --git a/de4dot.code/StringDecrypter.cs b/de4dot.code/StringInliner.cs similarity index 96% rename from de4dot.code/StringDecrypter.cs rename to de4dot.code/StringInliner.cs index cdd1dac4..71079382 100644 --- a/de4dot.code/StringDecrypter.cs +++ b/de4dot.code/StringInliner.cs @@ -25,7 +25,7 @@ using de4dot.code.AssemblyClient; using de4dot.blocks; namespace de4dot.code { - abstract class StringDecrypter : MethodReturnValueInliner { + abstract class StringInlinerBase : MethodReturnValueInliner { protected override void inlineReturnValues(IList callResults) { foreach (var callResult in callResults) { var block = callResult.block; @@ -62,7 +62,7 @@ namespace de4dot.code { } } - class DynamicStringDecrypter : StringDecrypter { + class DynamicStringInliner : StringInlinerBase { IAssemblyClient assemblyClient; Dictionary methodTokenToId = new Dictionary(); @@ -78,7 +78,7 @@ namespace de4dot.code { get { return methodTokenToId.Count != 0; } } - public DynamicStringDecrypter(IAssemblyClient assemblyClient) { + public DynamicStringInliner(IAssemblyClient assemblyClient) { this.assemblyClient = assemblyClient; } @@ -129,7 +129,7 @@ namespace de4dot.code { } } - class StaticStringDecrypter : StringDecrypter { + class StaticStringInliner : StringInlinerBase { MethodDefinitionAndDeclaringTypeDict> stringDecrypters = new MethodDefinitionAndDeclaringTypeDict>(); public override bool HasHandlers { diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj index e8045c41..c0ad749b 100644 --- a/de4dot.code/de4dot.code.csproj +++ b/de4dot.code/de4dot.code.csproj @@ -186,7 +186,7 @@ - + diff --git a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs index dc0f5505..612adcf7 100644 --- a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs @@ -178,7 +178,7 @@ namespace de4dot.code.deobfuscators.CliSecure { proxyDelegateFinder.find(); - staticStringDecrypter.add(stringDecrypter.Method, (method, args) => stringDecrypter.decrypt((string)args[0])); + staticStringInliner.add(stringDecrypter.Method, (method, args) => stringDecrypter.decrypt((string)args[0])); if (options.DecryptMethods) { addCctorInitCallToBeRemoved(cliSecureRtType.InitializeMethod); diff --git a/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs b/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs index 4258cf54..dc938331 100644 --- a/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs @@ -172,7 +172,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator { stringDecrypter.init(resourceDecrypter); if (stringDecrypter.Method != null) { addResourceToBeRemoved(stringDecrypter.Resource, "Encrypted strings"); - staticStringDecrypter.add(stringDecrypter.Method, (method, args) => { + staticStringInliner.add(stringDecrypter.Method, (method, args) => { return stringDecrypter.decrypt((int)args[0]); }); DeobfuscatedFile.stringDecryptersAdded(); diff --git a/de4dot.code/deobfuscators/DeobfuscatorBase.cs b/de4dot.code/deobfuscators/DeobfuscatorBase.cs index 5f87f6ce..cec7255b 100644 --- a/de4dot.code/deobfuscators/DeobfuscatorBase.cs +++ b/de4dot.code/deobfuscators/DeobfuscatorBase.cs @@ -41,7 +41,7 @@ namespace de4dot.code.deobfuscators { OptionsBase optionsBase; protected ModuleDefinition module; - protected StaticStringDecrypter staticStringDecrypter = new StaticStringDecrypter(); + protected StaticStringInliner staticStringInliner = new StaticStringInliner(); IList> typesToRemove = new List>(); IList> methodsToRemove = new List>(); IList> fieldsToRemove = new List>(); @@ -153,7 +153,7 @@ namespace de4dot.code.deobfuscators { } public virtual void deobfuscateStrings(Blocks blocks) { - staticStringDecrypter.decrypt(blocks); + staticStringInliner.decrypt(blocks); } public virtual bool deobfuscateOther(Blocks blocks) { diff --git a/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs b/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs index 7dab2778..42291e25 100644 --- a/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs @@ -115,7 +115,7 @@ namespace de4dot.code.deobfuscators.Dotfuscator { public override void deobfuscateBegin() { base.deobfuscateBegin(); foreach (var info in stringDecrypter.StringDecrypterInfos) - staticStringDecrypter.add(info.method, (method, args) => stringDecrypter.decrypt(method, (string)args[0], (int)args[1])); + staticStringInliner.add(info.method, (method, args) => stringDecrypter.decrypt(method, (string)args[0], (int)args[1])); } public override void deobfuscateEnd() { diff --git a/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs b/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs index b230af5d..5a73290c 100644 --- a/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs @@ -421,11 +421,11 @@ namespace de4dot.code.deobfuscators.SmartAssembly { Log.v("Adding string decrypter. Resource: {0}", Utils.toCsharpString(info.StringsResource.Name)); var decrypter = new StringDecrypter(info); if (decrypter.CanDecrypt) { - staticStringDecrypter.add(DotNetUtils.getMethod(info.GetStringDelegate, "Invoke"), (method, args) => { + staticStringInliner.add(DotNetUtils.getMethod(info.GetStringDelegate, "Invoke"), (method, args) => { var fieldDefinition = DotNetUtils.getField(module, (FieldReference)args[0]); return decrypter.decrypt(fieldDefinition.MetadataToken.ToInt32(), (int)args[1]); }); - staticStringDecrypter.add(info.StringDecrypterMethod, (method, args) => { + staticStringInliner.add(info.StringDecrypterMethod, (method, args) => { return decrypter.decrypt(0, (int)args[0]); }); } @@ -546,7 +546,7 @@ namespace de4dot.code.deobfuscators.SmartAssembly { public override IEnumerable getStringDecrypterMethods() { var list = new List(); - foreach (var method in staticStringDecrypter.Methods) + foreach (var method in staticStringInliner.Methods) list.Add(method.MetadataToken.ToInt32().ToString("X8")); return list; } diff --git a/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs b/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs index f1af136b..4638bb11 100644 --- a/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs @@ -99,7 +99,7 @@ namespace de4dot.code.deobfuscators.Xenocode { public override void deobfuscateBegin() { base.deobfuscateBegin(); - staticStringDecrypter.add(stringDecrypter.Method, (method, args) => stringDecrypter.decrypt((string)args[0], (int)args[1])); + staticStringInliner.add(stringDecrypter.Method, (method, args) => stringDecrypter.decrypt((string)args[0], (int)args[1])); } public override void deobfuscateEnd() { diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs index a301cf59..33ebc655 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs @@ -249,10 +249,10 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { antiStrongName = new AntiStrongName(); - staticStringDecrypter.add(decrypterType.StringDecrypter1, (method2, args) => { + staticStringInliner.add(decrypterType.StringDecrypter1, (method2, args) => { return decrypterType.decrypt1((string)args[0]); }); - staticStringDecrypter.add(decrypterType.StringDecrypter2, (method2, args) => { + staticStringInliner.add(decrypterType.StringDecrypter2, (method2, args) => { return decrypterType.decrypt2((string)args[0]); }); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs index a3ae81c0..637602a4 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs @@ -421,12 +421,12 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { } foreach (var info in stringDecrypter.DecrypterInfos) { - staticStringDecrypter.add(info.method, (method2, args) => { + staticStringInliner.add(info.method, (method2, args) => { return stringDecrypter.decrypt(method2, (int)args[0]); }); } if (stringDecrypter.OtherStringDecrypter != null) { - staticStringDecrypter.add(stringDecrypter.OtherStringDecrypter, (method2, args) => { + staticStringInliner.add(stringDecrypter.OtherStringDecrypter, (method2, args) => { return stringDecrypter.decrypt((string)args[0]); }); }