From 30f713f8f8ed53ef8931b93bafaed667f4aad64c Mon Sep 17 00:00:00 2001 From: de4dot Date: Fri, 4 Nov 2011 00:39:48 +0100 Subject: [PATCH] Rename isDelegateType() -> derivesFromDelegate() --- blocks/DotNetUtils.cs | 2 +- de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs | 2 +- .../deobfuscators/SmartAssembly/AssemblyResolverInfo.cs | 2 +- de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs | 2 +- .../deobfuscators/SmartAssembly/ProxyDelegateFinder.cs | 2 +- .../deobfuscators/SmartAssembly/StringEncoderClassFinder.cs | 4 ++-- de4dot.code/deobfuscators/TypesRestorer.cs | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/blocks/DotNetUtils.cs b/blocks/DotNetUtils.cs index 893ebb47..84c6fc93 100644 --- a/blocks/DotNetUtils.cs +++ b/blocks/DotNetUtils.cs @@ -282,7 +282,7 @@ namespace de4dot.blocks { return type != null && (type.FullName == "System.Delegate" || type.FullName == "System.MulticastDelegate"); } - public static bool isDelegateType(TypeDefinition type) { + public static bool derivesFromDelegate(TypeDefinition type) { return type != null && isDelegate(type.BaseType); } diff --git a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs index bb35bfc6..60faeb8a 100644 --- a/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs @@ -214,7 +214,7 @@ namespace de4dot.deobfuscators.CliSecure { base.deobfuscateBegin(); foreach (var type in module.Types) { - if (type.FullName == "InitializeDelegate" && DotNetUtils.isDelegateType(type)) + if (type.FullName == "InitializeDelegate" && DotNetUtils.derivesFromDelegate(type)) this.addTypeToBeRemoved(type, "Obfuscator type"); else if (findResourceDecrypter(type)) { // Nothing diff --git a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs index f753ec2e..f62c1bff 100644 --- a/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs +++ b/de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs @@ -105,7 +105,7 @@ namespace de4dot.deobfuscators.SmartAssembly { return true; foreach (var field in type.Fields) { - if (!DotNetUtils.isDelegateType(DotNetUtils.getType(module, field.FieldType))) + if (!DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, field.FieldType))) return false; } return true; diff --git a/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs b/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs index 8a523011..c9ebb4cf 100644 --- a/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs +++ b/de4dot.code/deobfuscators/SmartAssembly/MemoryManagerInfo.cs @@ -73,7 +73,7 @@ namespace de4dot.deobfuscators.SmartAssembly { fields++; continue; } - if (DotNetUtils.isDelegateType(DotNetUtils.getType(module, field.FieldType))) + if (DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, field.FieldType))) continue; return false; diff --git a/de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs b/de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs index f1749bb8..4d9a979a 100644 --- a/de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs +++ b/de4dot.code/deobfuscators/SmartAssembly/ProxyDelegateFinder.cs @@ -93,7 +93,7 @@ namespace de4dot.deobfuscators.SmartAssembly { public void findDelegateCreator(ModuleDefinition module) { var callCounter = new CallCounter(); foreach (var type in module.Types) { - if (type.Namespace != "" || !DotNetUtils.isDelegateType(type)) + if (type.Namespace != "" || !DotNetUtils.derivesFromDelegate(type)) continue; var cctor = DotNetUtils.getMethod(type, ".cctor"); if (cctor == null) diff --git a/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs b/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs index f3a10234..fa373ede 100644 --- a/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs +++ b/de4dot.code/deobfuscators/SmartAssembly/StringEncoderClassFinder.cs @@ -117,7 +117,7 @@ namespace de4dot.deobfuscators.SmartAssembly { if (typeToken == null) continue; var delegateType = getType(typeToken); - if (!DotNetUtils.isDelegateType(delegateType)) + if (!DotNetUtils.derivesFromDelegate(delegateType)) continue; var invoke = DotNetUtils.getMethod(delegateType, "Invoke"); if (invoke == null || !DotNetUtils.isMethod(invoke, "System.String", "(System.Int32)")) @@ -143,7 +143,7 @@ namespace de4dot.deobfuscators.SmartAssembly { if (typeToken == null) continue; var type = getType(typeToken); - if (type == null || DotNetUtils.isDelegateType(type)) + if (type == null || DotNetUtils.derivesFromDelegate(type)) continue; if (!couldBeStringDecrypterClass(type)) continue; diff --git a/de4dot.code/deobfuscators/TypesRestorer.cs b/de4dot.code/deobfuscators/TypesRestorer.cs index 772c88dc..1116ef07 100644 --- a/de4dot.code/deobfuscators/TypesRestorer.cs +++ b/de4dot.code/deobfuscators/TypesRestorer.cs @@ -711,9 +711,9 @@ namespace de4dot.deobfuscators { } static TypeReference getCommonBaseClass(ModuleDefinition module, TypeReference a, TypeReference b) { - if (DotNetUtils.isDelegate(a) && DotNetUtils.isDelegateType(DotNetUtils.getType(module, b))) + if (DotNetUtils.isDelegate(a) && DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, b))) return b; - if (DotNetUtils.isDelegate(b) && DotNetUtils.isDelegateType(DotNetUtils.getType(module, a))) + if (DotNetUtils.isDelegate(b) && DotNetUtils.derivesFromDelegate(DotNetUtils.getType(module, a))) return a; return null; //TODO: }