From 83725200c129f45f7a5c3d986254afa445a074ca Mon Sep 17 00:00:00 2001 From: de4dot Date: Thu, 3 May 2012 14:53:01 +0200 Subject: [PATCH] Add isValidResourceKeyName() --- de4dot.code/deobfuscators/DeobfuscatorBase.cs | 4 ++++ de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs | 4 ++++ de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs | 4 ++++ de4dot.code/renamer/INameChecker.cs | 1 + 4 files changed, 13 insertions(+) diff --git a/de4dot.code/deobfuscators/DeobfuscatorBase.cs b/de4dot.code/deobfuscators/DeobfuscatorBase.cs index 1b4faf5c..3c209ded 100644 --- a/de4dot.code/deobfuscators/DeobfuscatorBase.cs +++ b/de4dot.code/deobfuscators/DeobfuscatorBase.cs @@ -745,6 +745,10 @@ namespace de4dot.code.deobfuscators { return name != null && checkValidName(name); } + public virtual bool isValidResourceKeyName(string name) { + return name != null && checkValidName(name); + } + public virtual void OnBeforeAddingResources(MetadataBuilder builder) { } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs index cca460a4..150c96be 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs @@ -218,6 +218,10 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { return name != null && checkValidName(name, isRandomNameMembers); } + public override bool isValidResourceKeyName(string name) { + return name != null && checkValidName(name, isRandomNameMembers); + } + protected override int detectInternal() { int val = 0; diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs index a72ee466..0be1f216 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs @@ -222,6 +222,10 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { return name != null && checkValidName(name, isRandomNameMembers); } + public override bool isValidResourceKeyName(string name) { + return name != null && checkValidName(name, isRandomNameMembers); + } + protected override int detectInternal() { int val = 0; diff --git a/de4dot.code/renamer/INameChecker.cs b/de4dot.code/renamer/INameChecker.cs index 4334dd16..2edd05f0 100644 --- a/de4dot.code/renamer/INameChecker.cs +++ b/de4dot.code/renamer/INameChecker.cs @@ -27,5 +27,6 @@ namespace de4dot.code.renamer { bool isValidFieldName(string name); bool isValidGenericParamName(string name); bool isValidMethodArgName(string name); + bool isValidResourceKeyName(string name); } }