Support latest CO build

This commit is contained in:
de4dot 2012-06-27 10:45:45 +02:00
parent cd0a193bdf
commit 12797ecb03
4 changed files with 6 additions and 3 deletions

View File

@ -62,7 +62,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
if (DotNetUtils.getPInvokeMethod(type, "kernel32", "GetProcAddress") == null) if (DotNetUtils.getPInvokeMethod(type, "kernel32", "GetProcAddress") == null)
continue; continue;
deobfuscate(method); deobfuscate(method);
if (!containsString(method, "debugger is activ")) if (!containsString(method, "debugger is activ") &&
!containsString(method, "debugger is running"))
continue; continue;
antiDebuggerType = type; antiDebuggerType = type;

View File

@ -127,7 +127,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 > 5) if (type.Fields.Count < 1 || type.Fields.Count > 6)
return null; return null;
MethodDefinition createMethod = null; MethodDefinition createMethod = null;

View File

@ -300,6 +300,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
return method; return method;
if (DotNetUtils.isMethod(method, "System.Byte[]", "(System.Int32,System.IO.Stream)")) if (DotNetUtils.isMethod(method, "System.Byte[]", "(System.Int32,System.IO.Stream)"))
return method; return method;
if (DotNetUtils.isMethod(method, "System.Byte[]", "(System.Int16,System.IO.Stream)"))
return method;
} }
return null; return null;
} }

View File

@ -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 > 7) if (type.Methods.Count < 3 || type.Methods.Count > 8)
return false; return false;
if (DotNetUtils.getPInvokeMethod(type, "mscoree", "StrongNameSignatureVerificationEx") != null) { if (DotNetUtils.getPInvokeMethod(type, "mscoree", "StrongNameSignatureVerificationEx") != null) {
} }