Merge branch 'co'
This commit is contained in:
commit
5faea7f830
|
@ -68,7 +68,9 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
!ContainsString(method, "Debugger was detected") &&
|
!ContainsString(method, "Debugger was detected") &&
|
||||||
!ContainsString(method, "{0} was detected") &&
|
!ContainsString(method, "{0} was detected") &&
|
||||||
!ContainsString(method, "run under") &&
|
!ContainsString(method, "run under") &&
|
||||||
!ContainsString(method, "run with"))
|
!ContainsString(method, "run with") &&
|
||||||
|
!ContainsString(method, "started under") &&
|
||||||
|
!ContainsString(method, "{0} detected"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
antiDebuggerType = type;
|
antiDebuggerType = type;
|
||||||
|
|
|
@ -110,7 +110,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
MethodDef GetProxyCreateMethod(TypeDef type) {
|
MethodDef GetProxyCreateMethod(TypeDef 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 > 16)
|
if (type.Fields.Count < 1 || type.Fields.Count > 18)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
MethodDef createMethod = null;
|
MethodDef createMethod = null;
|
||||||
|
|
|
@ -268,7 +268,7 @@ namespace de4dot.code.deobfuscators.CryptoObfuscator {
|
||||||
if (!ldci4.IsLdcI4())
|
if (!ldci4.IsLdcI4())
|
||||||
continue;
|
continue;
|
||||||
int loopCount = ldci4.GetLdcI4Value();
|
int loopCount = ldci4.GetLdcI4Value();
|
||||||
if (loopCount < 2 || loopCount > 3)
|
if (loopCount < 2 || loopCount > 4)
|
||||||
continue;
|
continue;
|
||||||
var blt = instrs[i + 1];
|
var blt = instrs[i + 1];
|
||||||
if (blt.OpCode.Code != Code.Blt && blt.OpCode.Code != Code.Blt_S && blt.OpCode.Code != Code.Clt)
|
if (blt.OpCode.Code != Code.Blt && blt.OpCode.Code != Code.Blt_S && blt.OpCode.Code != Code.Clt)
|
||||||
|
|
|
@ -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 > 24)
|
if (type.Methods.Count < 3 || type.Methods.Count > 27)
|
||||||
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