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

Merged master

Browse Source
This commit is contained in:
de4dot 2011-09-27 02:05:46 +02:00
commit 695dd81b43
14 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AssemblyData/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
AssemblyServer-x64/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
AssemblyServer-x86/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
AssemblyServer/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
Test.Rename.Dll/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
Test.Rename/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

3
blocks/BlocksSorter.cs
View File

@ -41,7 +41,8 @@ namespace de4dot.blocks {
visited = new Dictionary<BaseBlock, bool>(); visited = new Dictionary<BaseBlock, bool>();
sorted = new List<BaseBlock>(scopeBlock.BaseBlocks.Count); sorted = new List<BaseBlock>(scopeBlock.BaseBlocks.Count);
search(scopeBlock.BaseBlocks[0]); if (scopeBlock.BaseBlocks.Count > 0)
search(scopeBlock.BaseBlocks[0]);
sorted.Reverse(); // It's in reverse order sorted.Reverse(); // It's in reverse order
// Just in case there's dead code or unreferenced exception blocks // Just in case there's dead code or unreferenced exception blocks

4
blocks/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
de4dot-x64/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
de4dot-x86/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

8
de4dot.code/ObfuscatedFile.cs
View File

@ -414,7 +414,7 @@ namespace de4dot {
Log.v("Deobfuscating {0} ({1:X8})", method, method.MetadataToken.ToUInt32()); Log.v("Deobfuscating {0} ({1:X8})", method, method.MetadataToken.ToUInt32());
Log.indent(); Log.indent();
if (method.HasBody) { if (hasNonEmptyBody(method)) {
var blocks = new Blocks(method); var blocks = new Blocks(method);
deob.deobfuscateMethodBegin(blocks); deob.deobfuscateMethodBegin(blocks);
@ -440,6 +440,10 @@ namespace de4dot {
} }
} }
bool hasNonEmptyBody(MethodDefinition method) {
return method.HasBody && method.Body.Instructions.Count > 0;
}
void deobfuscateStrings(Blocks blocks) { void deobfuscateStrings(Blocks blocks) {
switch (options.StringDecrypterType) { switch (options.StringDecrypterType) {
case DecrypterType.None: case DecrypterType.None:
@ -488,7 +492,7 @@ namespace de4dot {
Log.v("{0}: {1} ({2:X8})", msg, method, method.MetadataToken.ToUInt32()); Log.v("{0}: {1} ({2:X8})", msg, method, method.MetadataToken.ToUInt32());
Log.indent(); Log.indent();
if (method.HasBody) { if (hasNonEmptyBody(method)) {
var blocks = new Blocks(method); var blocks = new Blocks(method);
handler(blocks); handler(blocks);

4
de4dot.code/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
de4dot/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]

4
dumpMethods/Properties/AssemblyInfo.cs
View File

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: AssemblyVersion("1.0.0.3405")] [assembly: AssemblyVersion("1.0.1.3405")]
[assembly: AssemblyFileVersion("1.0.0.3405")] [assembly: AssemblyFileVersion("1.0.1.3405")]