diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj index b19bc29f..bdd4f466 100644 --- a/de4dot.code/de4dot.code.csproj +++ b/de4dot.code/de4dot.code.csproj @@ -261,8 +261,8 @@ - - + + diff --git a/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs b/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs index dc2446f1..a2a64a5a 100644 --- a/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/Xenocode/StringDecrypter.cs @@ -24,7 +24,7 @@ using de4dot.blocks; namespace de4dot.code.deobfuscators.Xenocode { class StringDecrypter { const int STRING_DECRYPTER_KEY_CONST = 1789; - ModuleDefinition module; + ModuleDefMD module; TypeDef stringDecrypterType; MethodDef stringDecrypterMethod; @@ -40,7 +40,7 @@ namespace de4dot.code.deobfuscators.Xenocode { get { return stringDecrypterMethod; } } - public StringDecrypter(ModuleDefinition module) { + public StringDecrypter(ModuleDefMD module) { this.module = module; } @@ -64,12 +64,12 @@ namespace de4dot.code.deobfuscators.Xenocode { method = null; break; } - if (method == null || method.Body == null) + if (method == null || method.CilBody == null) continue; bool foundConstant = false; - foreach (var instr in method.Body.Instructions) { - if (DotNetUtils.isLdcI4(instr) && DotNetUtils.getLdcI4Value(instr) == STRING_DECRYPTER_KEY_CONST) { + foreach (var instr in method.CilBody.Instructions) { + if (instr.IsLdcI4() && instr.GetLdcI4Value() == STRING_DECRYPTER_KEY_CONST) { foundConstant = true; break; } diff --git a/de4dot.cui/Program.cs b/de4dot.cui/Program.cs index 738a6fa8..c949b7a3 100644 --- a/de4dot.cui/Program.cs +++ b/de4dot.cui/Program.cs @@ -57,8 +57,8 @@ namespace de4dot.cui { new de4dot.code.deobfuscators.Skater_NET.DeobfuscatorInfo(), new de4dot.code.deobfuscators.SmartAssembly.DeobfuscatorInfo(), new de4dot.code.deobfuscators.Spices_Net.DeobfuscatorInfo(), - new de4dot.code.deobfuscators.Xenocode.DeobfuscatorInfo(), #endif + new de4dot.code.deobfuscators.Xenocode.DeobfuscatorInfo(), }; }