Support latest CO build

This commit is contained in:
de4dot
2012-07-11 02:15:33 +02:00
parent 9f8cac4dac
commit 8f2f2f46ce
4 changed files with 6 additions and 3 deletions
@@ -63,7 +63,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
continue;
deobfuscate(method);
if (!containsString(method, "debugger is activ") &&
!containsString(method, "debugger is running"))
!containsString(method, "debugger is running") &&
!containsString(method, "run under a debugger"))
continue;
antiDebuggerType = type;
@@ -127,7 +127,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
MethodDefinition getProxyCreateMethod(TypeDefinition type) {
if (DotNetUtils.findFieldType(type, "System.ModuleHandle", true) == null)
return null;
if (type.Fields.Count < 1 || type.Fields.Count > 6)
if (type.Fields.Count < 1 || type.Fields.Count > 7)
return null;
MethodDefinition createMethod = null;
@@ -302,6 +302,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
return method;
if (DotNetUtils.isMethod(method, "System.Byte[]", "(System.Int16,System.IO.Stream)"))
return method;
if (DotNetUtils.isMethod(method, "System.Byte[]", "(System.Byte,System.IO.Stream)"))
return method;
}
return null;
}
@@ -84,7 +84,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
if (!method.IsStatic || !DotNetUtils.isMethod(method, "System.Void", "()"))
return false;
if (type.Methods.Count < 3 || type.Methods.Count > 8)
if (type.Methods.Count < 3 || type.Methods.Count > 9)
return false;
if (DotNetUtils.getPInvokeMethod(type, "mscoree", "StrongNameSignatureVerificationEx") != null) {
}