Fix some older merges
This commit is contained in:
parent
f279bed1ed
commit
436fe05756
18
.gitignore
vendored
18
.gitignore
vendored
|
@ -1,10 +1,8 @@
|
||||||
*~
|
*~
|
||||||
*/obj/
|
*/obj/
|
||||||
*.csproj.user
|
*.csproj.user
|
||||||
*.sdf
|
*.sdf
|
||||||
*.opensdf
|
*.opensdf
|
||||||
*.suo
|
*.suo
|
||||||
/Debug/
|
/Debug/
|
||||||
/Release/
|
/Release/
|
||||||
/deobfuscator.*/
|
|
||||||
!/deobfuscator.Template/
|
|
||||||
|
|
|
@ -322,8 +322,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
int sourceStreamOffset = 1;
|
int sourceStreamOffset = 1;
|
||||||
bool didSomething = false;
|
bool didSomething = false;
|
||||||
|
|
||||||
if (skipBeforeFlag)
|
if (skipBeforeFlag) {
|
||||||
{
|
|
||||||
sourceStream.Position += skipBytes;
|
sourceStream.Position += skipBytes;
|
||||||
sourceStreamOffset += skipBytes;
|
sourceStreamOffset += skipBytes;
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,8 +86,6 @@ namespace de4dot.code.deobfuscators.Unknown {
|
||||||
string ScanTypes() {
|
string ScanTypes() {
|
||||||
foreach (var type in module.Types) {
|
foreach (var type in module.Types) {
|
||||||
var fn = type.FullName;
|
var fn = type.FullName;
|
||||||
if (fn == "ConfusedByAttribute")
|
|
||||||
return "Confuser";
|
|
||||||
if (fn == "ZYXDNGuarder")
|
if (fn == "ZYXDNGuarder")
|
||||||
return "DNGuard HVM";
|
return "DNGuard HVM";
|
||||||
if (type.Name.String.Contains("();\t"))
|
if (type.Name.String.Contains("();\t"))
|
||||||
|
|
|
@ -21,8 +21,7 @@ using System.Collections.Generic;
|
||||||
using dnlib.DotNet;
|
using dnlib.DotNet;
|
||||||
|
|
||||||
namespace de4dot.code.renamer.asmmodules {
|
namespace de4dot.code.renamer.asmmodules {
|
||||||
public class MGenericParamDef : Ref
|
public class MGenericParamDef : Ref {
|
||||||
{
|
|
||||||
public GenericParam GenericParam {
|
public GenericParam GenericParam {
|
||||||
get { return (GenericParam)memberRef; }
|
get { return (GenericParam)memberRef; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,7 +109,6 @@ namespace de4dot.cui {
|
||||||
Logger.n("");
|
Logger.n("");
|
||||||
Logger.n("de4dot v{0} Copyright (C) 2011-2014 de4dot@gmail.com", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
|
Logger.n("de4dot v{0} Copyright (C) 2011-2014 de4dot@gmail.com", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
|
||||||
Logger.n("Latest version and source code: https://github.com/0xd4d/de4dot");
|
Logger.n("Latest version and source code: https://github.com/0xd4d/de4dot");
|
||||||
Logger.n("{0} deobfuscator modules loaded!", deobfuscatorInfos.Count);
|
|
||||||
Logger.n("");
|
Logger.n("");
|
||||||
|
|
||||||
var options = new FilesDeobfuscator.Options();
|
var options = new FilesDeobfuscator.Options();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user