Merge branch 'master' into newcode

This commit is contained in:
de4dot 2012-01-09 23:02:58 +01:00
commit 0dbe743563
218 changed files with 242 additions and 230 deletions

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AssemblyData")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AssemblyServer-x64")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AssemblyServer")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Test.Rename.Dll")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Test.Rename")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("blocks")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

2
cecil

@ -1 +1 @@
Subproject commit 9cdecd18b19f41d48476dd1b1c7d9a87df14e500
Subproject commit 9704f4eff88834dc5e6e1a20d9e54e21686ad435

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("de4dot-x64")]
[assembly: AssemblyCopyright("Copyright (C) 2011 de4dot@gmail.com")]
[assembly: AssemblyCopyright("Copyright (C) 2011-2012 de4dot@gmail.com")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.
@ -287,18 +287,30 @@ namespace de4dot.code {
}
IDeobfuscator detectObfuscator2(IEnumerable<IDeobfuscator> deobfuscators) {
var allDetected = new List<IDeobfuscator>();
IDeobfuscator detected = null;
int detectVal = 0;
foreach (var deob in deobfuscators) {
this.deob = deob; // So we can call deob.CanInlineMethods in deobfuscate()
int val = deob.detect();
Log.v("{0,3}: {1}", val, deob.TypeLong);
if (val > 0 && deob.Type != "un")
allDetected.Add(deob);
if (val > detectVal) {
detectVal = val;
detected = deob;
}
}
this.deob = null;
if (allDetected.Count > 1) {
Log.n("More than one obfuscator detected:");
Log.indent();
foreach (var deob in allDetected)
Log.n("{0} (use: -p {1})", deob.Name, deob.Type);
Log.deIndent();
}
return detected;
}

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011 de4dot@gmail.com
Copyright (C) 2011-2012 de4dot@gmail.com
This file is part of de4dot.

Some files were not shown because too many files have changed in this diff Show More