monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support latest CO build

Browse Source
This commit is contained in:
de4dot 2012-08-22 18:33:27 +02:00
parent 1a5603a112
commit a34b3f7855
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
de4dot.code/deobfuscators/CryptoObfuscator/AntiDebugger.cs
View File

@ -67,7 +67,8 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
!containsString(method, "run under a debugger") &&
!containsString(method, "run under debugger") &&
!containsString(method, "Debugger detected") &&
!containsString(method, "Debugger was detected"))
!containsString(method, "Debugger was detected") &&
!containsString(method, "{0} was detected"))
continue;
antiDebuggerType = type;

2
de4dot.code/deobfuscators/CryptoObfuscator/ProxyCallFixer.cs
View File

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

5
de4dot.code/deobfuscators/CryptoObfuscator/ResourceDecrypter.cs
View File

@ -272,12 +272,13 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
var ldci4 = instrs[i];
if (!DotNetUtils.isLdcI4(ldci4))
continue;
if (DotNetUtils.getLdcI4Value(ldci4) != 2)
int loopCount = DotNetUtils.getLdcI4Value(ldci4);
if (loopCount < 2 || loopCount > 3)
continue;
var blt = instrs[i + 1];
if (blt.OpCode.Code != Code.Blt && blt.OpCode.Code != Code.Blt_S)
continue;
return 1;
return loopCount - 1;
}
return 0;
}

2
de4dot.code/deobfuscators/CryptoObfuscator/TamperDetection.cs
View File

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