monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change return type to IEnumerable<int>

Browse Source
This commit is contained in:
de4dot 2012-02-25 06:25:40 +01:00
parent 48758be8f0
commit 10ceb12e30
18 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
de4dot.code/ObfuscatedFile.cs
View File

@ -407,12 +407,10 @@ namespace de4dot.code {
}
IEnumerable<int> getMethodTokens() {
var tokens = new List<int>();
if (!userStringDecrypterMethods)
return deob.getStringDecrypterMethods();
if (!userStringDecrypterMethods) {
options.StringDecrypterMethods.Clear();
options.StringDecrypterMethods.AddRange(deob.getStringDecrypterMethods());
}
var tokens = new List<int>();
foreach (var val in options.StringDecrypterMethods) {
var tokenStr = val.Trim();

6
de4dot.code/deobfuscators/Babel_NET/Deobfuscator.cs
View File

@ -259,10 +259,10 @@ namespace de4dot.code.deobfuscators.Babel_NET {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (stringDecrypter.DecryptMethod != null)
list.Add(stringDecrypter.DecryptMethod.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.DecryptMethod.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/CliSecure/Deobfuscator.cs
View File

@ -225,10 +225,10 @@ namespace de4dot.code.deobfuscators.CliSecure {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (stringDecrypter.Method != null)
list.Add(stringDecrypter.Method.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.Method.MetadataToken.ToInt32());
return list;
}

6
de4dot.code/deobfuscators/CodeVeil/Deobfuscator.cs
View File

@ -278,10 +278,10 @@ namespace de4dot.code.deobfuscators.CodeVeil {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (stringDecrypter.DecryptMethod != null)
list.Add(stringDecrypter.DecryptMethod.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.DecryptMethod.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/CryptoObfuscator/Deobfuscator.cs
View File

@ -231,10 +231,10 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
addResourceToBeRemoved(resource, reason);
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (stringDecrypter.Method != null)
list.Add(stringDecrypter.Method.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.Method.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs
View File

@ -253,10 +253,10 @@ done:
removeInlinedMethods(DsInlinedMethodsFinder.find(module));
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var method in stringDecrypter.DecrypterMethods)
list.Add(method.MetadataToken.ToInt32().ToString("X8"));
list.Add(method.MetadataToken.ToInt32());
return list;
}
}

4
de4dot.code/deobfuscators/DeobfuscatorBase.cs
View File

@ -224,9 +224,7 @@ namespace de4dot.code.deobfuscators {
}
}
public virtual IEnumerable<string> getStringDecrypterMethods() {
return new List<string>();
}
public abstract IEnumerable<int> getStringDecrypterMethods();
class MethodCallRemover {
Dictionary<string, MethodDefinitionAndDeclaringTypeDict<bool>> methodNameInfos = new Dictionary<string, MethodDefinitionAndDeclaringTypeDict<bool>>();

6
de4dot.code/deobfuscators/Dotfuscator/Deobfuscator.cs
View File

@ -126,10 +126,10 @@ namespace de4dot.code.deobfuscators.Dotfuscator {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var method in stringDecrypter.StringDecrypters)
list.Add(method.MetadataToken.ToInt32().ToString("X8"));
list.Add(method.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/Eazfuscator_NET/Deobfuscator.cs
View File

@ -545,10 +545,10 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (decryptStringMethod != null)
list.Add(decryptStringMethod.MetadataToken.ToInt32().ToString("X8"));
list.Add(decryptStringMethod.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/Goliath_NET/Deobfuscator.cs
View File

@ -270,10 +270,10 @@ namespace de4dot.code.deobfuscators.Goliath_NET {
findAndRemoveInlinedMethods();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var method in stringDecrypter.getMethods())
list.Add(method.MetadataToken.ToInt32().ToString("X8"));
list.Add(method.MetadataToken.ToInt32());
return list;
}
}

2
de4dot.code/deobfuscators/IDeobfuscator.cs
View File

@ -107,6 +107,6 @@ namespace de4dot.code.deobfuscators {
void deobfuscateEnd();
// Called to get method token / pattern of string decrypters
IEnumerable<string> getStringDecrypterMethods();
IEnumerable<int> getStringDecrypterMethods();
}
}

4
de4dot.code/deobfuscators/Skater_NET/Deobfuscator.cs
View File

@ -118,8 +118,8 @@ namespace de4dot.code.deobfuscators.Skater_NET {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
return list;
}
}

6
de4dot.code/deobfuscators/SmartAssembly/Deobfuscator.cs
View File

@ -542,10 +542,10 @@ namespace de4dot.code.deobfuscators.SmartAssembly {
}
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var method in staticStringInliner.Methods)
list.Add(method.MetadataToken.ToInt32().ToString("X8"));
list.Add(method.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/Spices_Net/Deobfuscator.cs
View File

@ -208,10 +208,10 @@ namespace de4dot.code.deobfuscators.Spices_Net {
}
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var info in stringDecrypter.DecrypterInfos)
list.Add(info.method.MetadataToken.ToInt32().ToString("X8"));
list.Add(info.method.MetadataToken.ToInt32());
return list;
}
}

5
de4dot.code/deobfuscators/Unknown/Deobfuscator.cs
View File

@ -17,6 +17,7 @@
along with de4dot. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace de4dot.code.deobfuscators.Unknown {
@ -112,5 +113,9 @@ namespace de4dot.code.deobfuscators.Unknown {
}
return null;
}
public override IEnumerable<int> getStringDecrypterMethods() {
return new List<int>();
}
}
}

6
de4dot.code/deobfuscators/Xenocode/Deobfuscator.cs
View File

@ -109,10 +109,10 @@ namespace de4dot.code.deobfuscators.Xenocode {
base.deobfuscateEnd();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
if (stringDecrypter.Method != null)
list.Add(stringDecrypter.Method.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.Method.MetadataToken.ToInt32());
return list;
}
}

6
de4dot.code/deobfuscators/dotNET_Reactor/v3/Deobfuscator.cs
View File

@ -329,10 +329,10 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 {
findAndRemoveInlinedMethods();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var method in decrypterType.StringDecrypters)
list.Add(method.MetadataToken.ToInt32().ToString("X8"));
list.Add(method.MetadataToken.ToInt32());
return list;
}
}

8
de4dot.code/deobfuscators/dotNET_Reactor/v4/Deobfuscator.cs
View File

@ -580,12 +580,12 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 {
findAndRemoveInlinedMethods();
}
public override IEnumerable<string> getStringDecrypterMethods() {
var list = new List<string>();
public override IEnumerable<int> getStringDecrypterMethods() {
var list = new List<int>();
foreach (var info in stringDecrypter.DecrypterInfos)
list.Add(info.method.MetadataToken.ToInt32().ToString("X8"));
list.Add(info.method.MetadataToken.ToInt32());
if (stringDecrypter.OtherStringDecrypter != null)
list.Add(stringDecrypter.OtherStringDecrypter.MetadataToken.ToInt32().ToString("X8"));
list.Add(stringDecrypter.OtherStringDecrypter.MetadataToken.ToInt32());
return list;
}