diff --git a/Editor/ObfusPasses/SymbolObfus/CacheRenamePolicy.cs b/Editor/ObfusPasses/SymbolObfus/CacheRenamePolicy.cs index 28fd70d..580eb34 100644 --- a/Editor/ObfusPasses/SymbolObfus/CacheRenamePolicy.cs +++ b/Editor/ObfusPasses/SymbolObfus/CacheRenamePolicy.cs @@ -15,16 +15,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus _underlyingPolicy = underlyingPolicy; } - public override bool NeedRename(ModuleDef mod) - { - if (!_computeCache.TryGetValue(mod, out var value)) - { - value = _underlyingPolicy.NeedRename(mod); - _computeCache.Add(mod, value); - } - return value; - } - public override bool NeedRename(TypeDef typeDef) { if (!_computeCache.TryGetValue(typeDef, out var value)) diff --git a/Editor/ObfusPasses/SymbolObfus/CombineRenamePolicy.cs b/Editor/ObfusPasses/SymbolObfus/CombineRenamePolicy.cs index 9cd796f..0354e56 100644 --- a/Editor/ObfusPasses/SymbolObfus/CombineRenamePolicy.cs +++ b/Editor/ObfusPasses/SymbolObfus/CombineRenamePolicy.cs @@ -12,11 +12,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus _policies = policies; } - public bool NeedRename(ModuleDef mod) - { - return _policies.All(policy => policy.NeedRename(mod)); - } - public bool NeedRename(TypeDef typeDef) { return _policies.All(policy => policy.NeedRename(typeDef)); diff --git a/Editor/ObfusPasses/SymbolObfus/IRenamePolicy.cs b/Editor/ObfusPasses/SymbolObfus/IRenamePolicy.cs index 9e787a5..21d5c2f 100644 --- a/Editor/ObfusPasses/SymbolObfus/IRenamePolicy.cs +++ b/Editor/ObfusPasses/SymbolObfus/IRenamePolicy.cs @@ -4,8 +4,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus { public interface IRenamePolicy { - bool NeedRename(ModuleDef mod); - bool NeedRename(TypeDef typeDef); bool NeedRename(MethodDef methodDef); diff --git a/Editor/ObfusPasses/SymbolObfus/RenamePolicyBase.cs b/Editor/ObfusPasses/SymbolObfus/RenamePolicyBase.cs index a545d03..44dba18 100644 --- a/Editor/ObfusPasses/SymbolObfus/RenamePolicyBase.cs +++ b/Editor/ObfusPasses/SymbolObfus/RenamePolicyBase.cs @@ -4,10 +4,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus { public abstract class RenamePolicyBase : IRenamePolicy { - public virtual bool NeedRename(ModuleDef mod) - { - return false; - } public virtual bool NeedRename(TypeDef typeDef) { diff --git a/Editor/ObfusPasses/SymbolObfus/RuleBasedRenamePolicy.cs b/Editor/ObfusPasses/SymbolObfus/RuleBasedRenamePolicy.cs index 9644a68..3905a1b 100644 --- a/Editor/ObfusPasses/SymbolObfus/RuleBasedRenamePolicy.cs +++ b/Editor/ObfusPasses/SymbolObfus/RuleBasedRenamePolicy.cs @@ -610,19 +610,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus } } - public override bool NeedRename(ModuleDef mod) - { - //string name = mod.Assembly.Name; - //if (!_assemblyRuleSpecs.TryGetValue(name, out var assemblyRuleSpec)) - //{ - // return false; - //} - //return assemblyRuleSpec.rule.obfuscateName; - - // TODO support rename assembly - return false; - } - private ModifierType ComputeModifierType(TypeAttributes visibility) { if (visibility == TypeAttributes.NotPublic || visibility == TypeAttributes.NestedPrivate) diff --git a/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs b/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs index 3fc6435..9ae890d 100644 --- a/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs +++ b/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs @@ -176,7 +176,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus public void Process() { _renameRecordMap.Init(_toObfuscatedModules, _nameMaker); - RenameModules(); + RenameTypes(); RenameFields(); RenameMethods(); @@ -189,20 +189,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus return _obfuzAssemblies.Find(ass => ass.module == mod).referenceMeAssemblies; } - private void RenameModules() - { - Debug.Log("Rename Modules begin"); - foreach (ModuleDef mod in _toObfuscatedModules) - { - if (_renamePolicy.NeedRename(mod)) - { - Rename(mod); - } - } - Debug.Log("Rename Modules end"); - } - - class RefTypeDefMetas { public readonly List typeRefs = new List();