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

Add option to disable restoring props/events from method names

Browse Source
This commit is contained in:
de4dot 2011-11-23 05:45:30 +01:00
parent 397f5f5b5b
commit 0c36e74834
5 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
de4dot.code/CommandLineParser.cs
View File

@ -118,6 +118,9 @@ namespace de4dot {
miscOptions.Add(new NoArgOption(null, "dont-rename", "Don't rename classes, methods, etc.", () => {
filesOptions.RenameSymbols = false;
}));
miscOptions.Add(new NoArgOption(null, "dont-restore-props", "Don't restore properties/events", () => {
filesOptions.RestorePropsEvents = false;
}));
miscOptions.Add(new OneArgOption(null, "default-strtyp", "Default string decrypter type", "type", (val) => {
object decrypterType;
if (!stringDecrypterTypes.getValue(val, out decrypterType))
@ -156,7 +159,6 @@ namespace de4dot {
exitError(string.Format("File \"{0}\" does not exist.", val));
newFileOptions = new ObfuscatedFile.Options {
Filename = val,
RenameSymbols = filesOptions.RenameSymbols,
ControlFlowDeobfuscation = filesOptions.ControlFlowDeobfuscation,
KeepObfuscatorTypes = filesOptions.KeepObfuscatorTypes,
};

27
de4dot.code/FilesDeobfuscator.cs
View File

@ -36,6 +36,7 @@ namespace de4dot {
public IList<SearchDir> SearchDirs { get; set; }
public bool DetectObfuscators { get; set; }
public bool RenameSymbols { get; set; }
public bool RestorePropsEvents { get; set; }
public bool ControlFlowDeobfuscation { get; set; }
public bool KeepObfuscatorTypes { get; set; }
public bool OneFileAtATime { get; set; }
@ -49,6 +50,7 @@ namespace de4dot {
SearchDirs = new List<SearchDir>();
DefaultStringDecrypterMethods = new List<string>();
RenameSymbols = true;
RestorePropsEvents = true;
ControlFlowDeobfuscation = true;
}
}
@ -89,10 +91,7 @@ namespace de4dot {
file.deobfuscateBegin();
file.deobfuscate();
file.deobfuscateEnd();
if (options.RenameSymbols)
new Renamer(new List<IObfuscatedFile> { file }).rename();
rename(new List<IObfuscatedFile> { file });
file.save();
removeModule(file.ModuleDefinition);
@ -112,7 +111,7 @@ namespace de4dot {
void deobfuscateAll() {
var allFiles = new List<IObfuscatedFile>(loadAllFiles());
deobfuscateAllFiles(allFiles);
renameAllFiles(allFiles);
rename(allFiles);
saveAllFiles(allFiles);
}
@ -124,7 +123,6 @@ namespace de4dot {
DefaultStringDecrypterType = options.DefaultStringDecrypterType,
DefaultStringDecrypterMethods = options.DefaultStringDecrypterMethods,
AssemblyClientFactory = options.AssemblyClientFactory,
RenameSymbols = options.RenameSymbols,
ControlFlowDeobfuscation = options.ControlFlowDeobfuscation,
KeepObfuscatorTypes = options.KeepObfuscatorTypes,
CreateDestinationDir = !onlyScan,
@ -144,7 +142,6 @@ namespace de4dot {
public DecrypterType? DefaultStringDecrypterType { get; set; }
public List<string> DefaultStringDecrypterMethods { get; set; }
public IAssemblyClientFactory AssemblyClientFactory { get; set; }
public bool RenameSymbols { get; set; }
public bool ControlFlowDeobfuscation { get; set; }
public bool KeepObfuscatorTypes { get; set; }
public bool CreateDestinationDir { get; set; }
@ -279,7 +276,6 @@ namespace de4dot {
IObfuscatedFile createObfuscatedFile(SearchDir searchDir, string filename) {
var fileOptions = new ObfuscatedFile.Options {
Filename = Utils.getFullPath(filename),
RenameSymbols = options.RenameSymbols,
ControlFlowDeobfuscation = options.ControlFlowDeobfuscation,
KeepObfuscatorTypes = options.KeepObfuscatorTypes,
};
@ -339,12 +335,6 @@ namespace de4dot {
}
}
void renameAllFiles(IEnumerable<IObfuscatedFile> allFiles) {
if (!options.RenameSymbols)
return;
new Renamer(allFiles).rename();
}
void saveAllFiles(IEnumerable<IObfuscatedFile> allFiles) {
foreach (var file in allFiles)
file.save();
@ -356,5 +346,14 @@ namespace de4dot {
list.Add(info.createDeobfuscator());
return list;
}
void rename(IEnumerable<IObfuscatedFile> theFiles) {
if (!options.RenameSymbols)
return;
var renamer = new Renamer(theFiles) {
RestorePropertiesFromNames = options.RestorePropsEvents,
};
renamer.rename();
}
}
}

1
de4dot.code/IObfuscatedFile.cs
View File

@ -30,7 +30,6 @@ namespace de4dot {
string NewFilename { get; }
INameChecker NameChecker { get; }
bool RenameResourcesInCode { get; }
bool RenameSymbols { get; }
bool RemoveNamespaceWithOneType { get; }
void deobfuscateBegin();

6
de4dot.code/ObfuscatedFile.cs
View File

@ -85,7 +85,6 @@ namespace de4dot {
public string ForcedObfuscatorType { get; set; }
public DecrypterType StringDecrypterType { get; set; }
public List<string> StringDecrypterMethods { get; private set; }
public bool RenameSymbols { get; set; }
public bool ControlFlowDeobfuscation { get; set; }
public bool KeepObfuscatorTypes { get; set; }
@ -115,10 +114,6 @@ namespace de4dot {
get { return deob.TheOptions.RenameResourcesInCode; }
}
public bool RenameSymbols {
get { return options.RenameSymbols; }
}
public bool RemoveNamespaceWithOneType {
get { return (deob.RenamingOptions & RenamingOptions.RemoveNamespaceIfOneType) != 0; }
}
@ -192,7 +187,6 @@ namespace de4dot {
break;
}
op.RenameSymbols = options.RenameSymbols;
op.KeepObfuscatorTypes = options.KeepObfuscatorTypes;
return op;

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

@ -25,13 +25,11 @@ namespace de4dot.deobfuscators {
}
interface IOperations {
bool RenameSymbols { get; }
bool KeepObfuscatorTypes { get; }
OpDecryptString DecryptStrings { get; }
}
class Operations : IOperations {
public bool RenameSymbols { get; set; }
public bool KeepObfuscatorTypes { get; set; }
public OpDecryptString DecryptStrings { get; set; }
}