Log the returned revisions
This commit is contained in:
parent
5376c74919
commit
0d04bef305
|
@ -149,22 +149,23 @@ namespace de4dot.code.deobfuscators.Confuser {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void scanForObfuscator() {
|
protected override void scanForObfuscator() {
|
||||||
do {
|
jitMethodsDecrypter = new JitMethodsDecrypter(module, DeobfuscatedFile);
|
||||||
jitMethodsDecrypter = new JitMethodsDecrypter(module, DeobfuscatedFile);
|
try {
|
||||||
try {
|
jitMethodsDecrypter.find();
|
||||||
jitMethodsDecrypter.find();
|
}
|
||||||
}
|
catch {
|
||||||
catch {
|
}
|
||||||
}
|
if (jitMethodsDecrypter.Detected) {
|
||||||
if (jitMethodsDecrypter.Detected)
|
initializeObfuscatorName();
|
||||||
break;
|
return;
|
||||||
memoryMethodsDecrypter = new MemoryMethodsDecrypter(module, DeobfuscatedFile);
|
}
|
||||||
memoryMethodsDecrypter.find();
|
memoryMethodsDecrypter = new MemoryMethodsDecrypter(module, DeobfuscatedFile);
|
||||||
if (memoryMethodsDecrypter.Detected)
|
memoryMethodsDecrypter.find();
|
||||||
break;
|
if (memoryMethodsDecrypter.Detected) {
|
||||||
initTheRest(null);
|
initializeObfuscatorName();
|
||||||
} while (false);
|
return;
|
||||||
initializeObfuscatorName();
|
}
|
||||||
|
initTheRest(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
void initTheRest(Deobfuscator oldOne) {
|
void initTheRest(Deobfuscator oldOne) {
|
||||||
|
@ -234,8 +235,13 @@ namespace de4dot.code.deobfuscators.Confuser {
|
||||||
if (versionProvider == null)
|
if (versionProvider == null)
|
||||||
continue;
|
continue;
|
||||||
int minRev, maxRev;
|
int minRev, maxRev;
|
||||||
if (versionProvider.getRevisionRange(out minRev, out maxRev))
|
if (versionProvider.getRevisionRange(out minRev, out maxRev)) {
|
||||||
|
if (maxRev == int.MaxValue)
|
||||||
|
Log.v("r{0}-latest : {1}", minRev, versionProvider.GetType().Name);
|
||||||
|
else
|
||||||
|
Log.v("r{0}-r{1} : {2}", minRev, maxRev, versionProvider.GetType().Name);
|
||||||
vd.addRevs(minRev, maxRev);
|
vd.addRevs(minRev, maxRev);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return vd.getVersionString();
|
return vd.getVersionString();
|
||||||
}
|
}
|
||||||
|
@ -351,9 +357,7 @@ namespace de4dot.code.deobfuscators.Confuser {
|
||||||
public override void deobfuscateBegin() {
|
public override void deobfuscateBegin() {
|
||||||
base.deobfuscateBegin();
|
base.deobfuscateBegin();
|
||||||
|
|
||||||
var versionString = getVersionString();
|
Log.v("Detected {0}", obfuscatorName);
|
||||||
if (!string.IsNullOrEmpty(versionString))
|
|
||||||
Log.v("Detected version: {0}", versionString);
|
|
||||||
|
|
||||||
removeObfuscatorAttribute();
|
removeObfuscatorAttribute();
|
||||||
initializeConstantsDecrypterV18();
|
initializeConstantsDecrypterV18();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user