diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/IObfuscationPolicy.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/IObfuscationPolicy.cs index 34f9e99..2a39e45 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/IObfuscationPolicy.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/IObfuscationPolicy.cs @@ -13,7 +13,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus bool NeedRename(PropertyDef propertyDef); bool NeedRename(EventDef eventDef); - - bool NeedRename(ParamDef paramDef); } } diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CacheRenamePolicy.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CacheRenamePolicy.cs index 937ff66..ba6e9c6 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CacheRenamePolicy.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CacheRenamePolicy.cs @@ -64,15 +64,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies } return value; } - - public override bool NeedRename(ParamDef paramDef) - { - if (!_computeCache.TryGetValue(paramDef, out var value)) - { - value = _underlyingPolicy.NeedRename(paramDef); - _computeCache[paramDef] = value; - } - return value; - } } } diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CombineRenamePolicy.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CombineRenamePolicy.cs index 53ca0c9..a84a587 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CombineRenamePolicy.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/CombineRenamePolicy.cs @@ -36,10 +36,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies { return _policies.All(policy => policy.NeedRename(eventDef)); } - - public bool NeedRename(ParamDef paramDef) - { - return _policies.All(policy => policy.NeedRename(paramDef)); - } } } diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ConfigurableRenamePolicy.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ConfigurableRenamePolicy.cs index 101f0db..71e42b5 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ConfigurableRenamePolicy.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ConfigurableRenamePolicy.cs @@ -65,8 +65,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies { public string ruleName; public bool obfuscateName; - public bool obfuscateParam; - public bool obfuscateBody; } class FieldRuleSpec @@ -166,8 +164,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies { ruleName = "none", obfuscateName = false, - obfuscateParam = false, - obfuscateBody = false, }; private static readonly EventRule s_noneEventRule = new EventRule @@ -401,8 +397,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies var rule = new MethodRule(); rule.ruleName = ruleName; rule.obfuscateName = ParseBoolNoneOrFalse(element.GetAttribute("ob-name")); - rule.obfuscateParam = ParseBoolNoneOrFalse(element.GetAttribute("ob-param")); - rule.obfuscateBody = ParseBoolNoneOrFalse(element.GetAttribute("ob-body")); return rule; } @@ -818,8 +812,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies } MethodRule methodRule = e.Item2.rule; methodCache.obfuscateName &= methodRule.obfuscateName; - methodCache.obfuscateParam &= methodRule.obfuscateParam; - methodCache.obfuscateBody &= methodRule.obfuscateBody; } foreach (MethodRuleSpec methodSpec in totalMethodSpecs) { @@ -834,8 +826,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies } MethodRule methodRule = methodSpec.rule; methodCache.obfuscateName &= methodRule.obfuscateName; - methodCache.obfuscateParam &= methodRule.obfuscateParam; - methodCache.obfuscateBody &= methodRule.obfuscateBody; } } } @@ -879,17 +869,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies TypeDefComputeCache cache = GetOrCreateTypeDefRenameComputeCache(typeDef); return !cache.notObfuscatedEvents.Contains(eventDef); } - - public override bool NeedRename(ParamDef paramDef) - { - MethodDef methodDef = paramDef.DeclaringMethod; - TypeDef typeDef = methodDef.DeclaringType; - TypeDefComputeCache cache = GetOrCreateTypeDefRenameComputeCache(typeDef); - if (!cache.methods.TryGetValue(methodDef, out var methodCache)) - { - return true; - } - return methodCache.obfuscateParam; - } } } diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ObfuscationPolicyBase.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ObfuscationPolicyBase.cs index 96cfcce..6a271ad 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ObfuscationPolicyBase.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/ObfuscationPolicyBase.cs @@ -29,10 +29,5 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies { return true; } - - public virtual bool NeedRename(ParamDef paramDef) - { - return true; - } } } diff --git a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs index 64c8e0e..6e9997e 100644 --- a/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs +++ b/Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/SymbolRename.cs @@ -716,12 +716,9 @@ namespace Obfuz.ObfusPasses.SymbolObfus private void Rename(ParamDef param) { - if (_renamePolicy.NeedRename(param)) - { - string newName = _nameMaker.GetNewName(param, param.Name); - _renameRecordMap.AddRename(param, newName); - param.Name = newName; - } + string newName = _nameMaker.GetNewName(param, param.Name); + _renameRecordMap.AddRename(param, newName); + param.Name = newName; } private void Rename(EventDef eventDef)