Fix merge
This commit is contained in:
parent
ef69e7a44a
commit
acae068211
|
@ -28,12 +28,13 @@ namespace de4dot.code.deobfuscators.Confuser {
|
||||||
public class DeobfuscatorInfo : DeobfuscatorInfoBase {
|
public class DeobfuscatorInfo : DeobfuscatorInfoBase {
|
||||||
public const string THE_NAME = "Confuser";
|
public const string THE_NAME = "Confuser";
|
||||||
public const string THE_TYPE = "cr";
|
public const string THE_TYPE = "cr";
|
||||||
|
const string DEFAULT_REGEX = DeobfuscatorBase.DEFAULT_VALID_NAME_REGEX;
|
||||||
BoolOption removeAntiDebug;
|
BoolOption removeAntiDebug;
|
||||||
BoolOption removeAntiDump;
|
BoolOption removeAntiDump;
|
||||||
BoolOption decryptMainAsm;
|
BoolOption decryptMainAsm;
|
||||||
|
|
||||||
public DeobfuscatorInfo()
|
public DeobfuscatorInfo()
|
||||||
: base() {
|
: base(DEFAULT_REGEX) {
|
||||||
removeAntiDebug = new BoolOption(null, MakeArgName("antidb"), "Remove anti debug code", true);
|
removeAntiDebug = new BoolOption(null, MakeArgName("antidb"), "Remove anti debug code", true);
|
||||||
removeAntiDump = new BoolOption(null, MakeArgName("antidump"), "Remove anti dump code", true);
|
removeAntiDump = new BoolOption(null, MakeArgName("antidump"), "Remove anti dump code", true);
|
||||||
decryptMainAsm = new BoolOption(null, MakeArgName("decrypt-main"), "Decrypt main embedded assembly", true);
|
decryptMainAsm = new BoolOption(null, MakeArgName("decrypt-main"), "Decrypt main embedded assembly", true);
|
||||||
|
@ -49,10 +50,10 @@ namespace de4dot.code.deobfuscators.Confuser {
|
||||||
|
|
||||||
public override IDeobfuscator CreateDeobfuscator() {
|
public override IDeobfuscator CreateDeobfuscator() {
|
||||||
return new Deobfuscator(new Deobfuscator.Options {
|
return new Deobfuscator(new Deobfuscator.Options {
|
||||||
ValidNameRegex = validNameRegex.get(),
|
ValidNameRegex = validNameRegex.Get(),
|
||||||
RemoveAntiDebug = removeAntiDebug.get(),
|
RemoveAntiDebug = removeAntiDebug.Get(),
|
||||||
RemoveAntiDump = removeAntiDump.get(),
|
RemoveAntiDump = removeAntiDump.Get(),
|
||||||
DecryptMainAsm = decryptMainAsm.get(),
|
DecryptMainAsm = decryptMainAsm.Get(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user