From eefa799e0de9d86d1b34fb097cbdd0c1aecd35b5 Mon Sep 17 00:00:00 2001 From: de4dot Date: Thu, 29 Oct 2015 21:36:57 +0100 Subject: [PATCH] Fix merge. Code used a much older dnlib version --- de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs | 4 ++-- de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs b/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs index f1327ba3..16d485b4 100644 --- a/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/Confuser/JitMethodsDecrypter.cs @@ -476,7 +476,7 @@ namespace de4dot.code.deobfuscators.Confuser { DumpedMethods Decrypt_v17_r73404(MyPEImage peImage, byte[] fileData) { var dumpedMethods = new DumpedMethods(); - var methodDef = peImage.DotNetFile.MetaData.TablesStream.MethodTable; + var methodDef = peImage.MetaData.TablesStream.MethodTable; for (uint rid = 1; rid <= methodDef.Rows; rid++) { var dm = new DumpedMethod(); peImage.ReadMethodTableRowTo(dm, rid); @@ -604,7 +604,7 @@ namespace de4dot.code.deobfuscators.Confuser { DumpedMethods Decrypt(MyPEImage peImage, byte[] fileData, DecryptMethodData decrypter) { var dumpedMethods = new DumpedMethods(); - var methodDef = peImage.DotNetFile.MetaData.TablesStream.MethodTable; + var methodDef = peImage.MetaData.TablesStream.MethodTable; for (uint rid = 1; rid <= methodDef.Rows; rid++) { var dm = new DumpedMethod(); peImage.ReadMethodTableRowTo(dm, rid); diff --git a/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs b/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs index a6836c2b..07c6c147 100644 --- a/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs +++ b/de4dot.code/deobfuscators/Confuser/MethodsDecrypterBase.cs @@ -364,7 +364,7 @@ namespace de4dot.code.deobfuscators.Confuser { var memStream = new MemoryStream(); var writer = new BinaryWriter(memStream); var reader = peImage.Reader; - foreach (var mdStream in peImage.DotNetFile.MetaData.AllStreams) { + foreach (var mdStream in peImage.MetaData.AllStreams) { reader.Position = (long)mdStream.StartOffset; writer.Write(reader.ReadBytes((int)(mdStream.EndOffset - mdStream.StartOffset))); }