From b6537dc188dde00f3fa70660dffa5338730ebce8 Mon Sep 17 00:00:00 2001 From: de4dot Date: Wed, 7 Nov 2012 04:45:05 +0100 Subject: [PATCH] Fix lookup method sigs --- de4dot.code/deobfuscators/CodeVeil/MainType.cs | 2 +- de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs | 2 +- de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs | 2 +- de4dot.code/deobfuscators/MaxtoCode/MainType.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs | 2 +- .../deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs | 2 +- de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/de4dot.code/deobfuscators/CodeVeil/MainType.cs b/de4dot.code/deobfuscators/CodeVeil/MainType.cs index c3868f61..53270418 100644 --- a/de4dot.code/deobfuscators/CodeVeil/MainType.cs +++ b/de4dot.code/deobfuscators/CodeVeil/MainType.cs @@ -77,7 +77,7 @@ namespace de4dot.code.deobfuscators.CodeVeil { otherInitMethods.Add(lookup(otherInitMethod, "Could not find otherInitMethod")); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs index e01b7a08..811a2886 100644 --- a/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/CodeVeil/StringDecrypter.cs @@ -63,7 +63,7 @@ namespace de4dot.code.deobfuscators.CodeVeil { this.decrypterMethod = lookup(oldOne.decrypterMethod, "Could not find string decrypter method"); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs index c6f8fbef..4829a456 100644 --- a/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs +++ b/de4dot.code/deobfuscators/Eazfuscator_NET/EfUtils.cs @@ -56,7 +56,7 @@ namespace de4dot.code.deobfuscators.Eazfuscator_NET { switch (instr.OpCode.Code) { case Code.Starg: case Code.Starg_S: - case Code.Stelem_Any: + case Code.Stelem: case Code.Stelem_I: case Code.Stelem_I1: case Code.Stelem_I2: diff --git a/de4dot.code/deobfuscators/MaxtoCode/MainType.cs b/de4dot.code/deobfuscators/MaxtoCode/MainType.cs index 20466d55..37c98fcb 100644 --- a/de4dot.code/deobfuscators/MaxtoCode/MainType.cs +++ b/de4dot.code/deobfuscators/MaxtoCode/MainType.cs @@ -76,7 +76,7 @@ namespace de4dot.code.deobfuscators.MaxtoCode { this.mcModule2 = DeobUtils.lookup(module, oldOne.mcModule2, "Could not find MC runtime module ref #2"); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs index 80c1612c..c52c3ab4 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/DecrypterType.cs @@ -86,7 +86,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { updateModuleReferences(); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs index 78924412..e96ea153 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/NativeLibSaver.cs @@ -60,7 +60,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { } } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs index 4e46bbd7..bcd19eaa 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/AssemblyResolver.cs @@ -67,7 +67,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { this.assemblyResolverInitMethod = lookup(oldOne.assemblyResolverInitMethod, "Could not find assembly resolver init method"); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs index 45e5560d..7c025d86 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/EncryptedResource.cs @@ -65,7 +65,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { throw new ApplicationException("Could not initialize EncryptedResource"); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs index 60491a56..c9def674 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v4/StringDecrypter.cs @@ -90,7 +90,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v4 { otherStringDecrypter = lookup(oldOne.otherStringDecrypter, "Could not find string decrypter method"); } - T lookup(T def, string errorMessage) where T : MemberReference { + T lookup(T def, string errorMessage) where T : class, ICodedToken { return DeobUtils.lookup(module, def, errorMessage); }