Support latest CO build
This commit is contained in:
parent
1a5603a112
commit
a34b3f7855
|
@ -67,7 +67,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
!containsString(method, "run under a debugger") &&
|
!containsString(method, "run under a debugger") &&
|
||||||
!containsString(method, "run under debugger") &&
|
!containsString(method, "run under debugger") &&
|
||||||
!containsString(method, "Debugger detected") &&
|
!containsString(method, "Debugger detected") &&
|
||||||
!containsString(method, "Debugger was detected"))
|
!containsString(method, "Debugger was detected") &&
|
||||||
|
!containsString(method, "{0} was detected"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
antiDebuggerType = type;
|
antiDebuggerType = type;
|
||||||
|
|
|
@ -110,7 +110,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
MethodDefinition getProxyCreateMethod(TypeDefinition type) {
|
MethodDefinition getProxyCreateMethod(TypeDefinition type) {
|
||||||
if (DotNetUtils.findFieldType(type, "System.ModuleHandle", true) == null)
|
if (DotNetUtils.findFieldType(type, "System.ModuleHandle", true) == null)
|
||||||
return null;
|
return null;
|
||||||
if (type.Fields.Count < 1 || type.Fields.Count > 10)
|
if (type.Fields.Count < 1 || type.Fields.Count > 12)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
MethodDefinition createMethod = null;
|
MethodDefinition createMethod = null;
|
||||||
|
|
|
@ -272,12 +272,13 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
var ldci4 = instrs[i];
|
var ldci4 = instrs[i];
|
||||||
if (!DotNetUtils.isLdcI4(ldci4))
|
if (!DotNetUtils.isLdcI4(ldci4))
|
||||||
continue;
|
continue;
|
||||||
if (DotNetUtils.getLdcI4Value(ldci4) != 2)
|
int loopCount = DotNetUtils.getLdcI4Value(ldci4);
|
||||||
|
if (loopCount < 2 || loopCount > 3)
|
||||||
continue;
|
continue;
|
||||||
var blt = instrs[i + 1];
|
var blt = instrs[i + 1];
|
||||||
if (blt.OpCode.Code != Code.Blt && blt.OpCode.Code != Code.Blt_S)
|
if (blt.OpCode.Code != Code.Blt && blt.OpCode.Code != Code.Blt_S)
|
||||||
continue;
|
continue;
|
||||||
return 1;
|
return loopCount - 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
|
|
||||||
if (!method.IsStatic || !DotNetUtils.isMethod(method, "System.Void", "()"))
|
if (!method.IsStatic || !DotNetUtils.isMethod(method, "System.Void", "()"))
|
||||||
return false;
|
return false;
|
||||||
if (type.Methods.Count < 3 || type.Methods.Count > 12)
|
if (type.Methods.Count < 3 || type.Methods.Count > 14)
|
||||||
return false;
|
return false;
|
||||||
if (DotNetUtils.getPInvokeMethod(type, "mscoree", "StrongNameSignatureVerificationEx") != null) {
|
if (DotNetUtils.getPInvokeMethod(type, "mscoree", "StrongNameSignatureVerificationEx") != null) {
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user