From a0d65b2e86ffcfd597fefe67ea7eb0f44aa063c1 Mon Sep 17 00:00:00 2001 From: de4dot Date: Thu, 22 Dec 2011 23:51:26 +0100 Subject: [PATCH] Rename method --- de4dot.code/deobfuscators/DeobUtils.cs | 2 +- .../dotNET_Reactor/v3/ApplicationModeUnpacker.cs | 6 +++--- .../deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4dot.code/deobfuscators/DeobUtils.cs b/de4dot.code/deobfuscators/DeobUtils.cs index a6cbdfe9..ee6f6d79 100644 --- a/de4dot.code/deobfuscators/DeobUtils.cs +++ b/de4dot.code/deobfuscators/DeobUtils.cs @@ -64,7 +64,7 @@ namespace de4dot.code.deobfuscators { return true; } - public static byte[] decrypt(byte[] data, byte[] key, byte[] iv) { + public static byte[] aesDecrypt(byte[] data, byte[] key, byte[] iv) { using (var aes = new RijndaelManaged { Mode = CipherMode.CBC }) { using (var transform = aes.CreateDecryptor(key, iv)) { return transform.TransformFinalBlock(data, 0, data.Length); diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs index 8d5797b7..9b7d6845 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/ApplicationModeUnpacker.cs @@ -164,7 +164,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { offset += sizes[i]; string filename = Win32Path.GetFileName(filenames[index]); var data = peImage.offsetReadBytes(offset, (int)sizes[index + 1]); - data = DeobUtils.decrypt(data, decrypter.AssemblyKey, decrypter.AssemblyIv); + data = DeobUtils.aesDecrypt(data, decrypter.AssemblyKey, decrypter.AssemblyIv); data = decompress(data); return new UnpackedFile(filename, data); } @@ -199,11 +199,11 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { } static byte[] decrypt1(byte[] data) { - return DeobUtils.decrypt(data, key1, iv1); + return DeobUtils.aesDecrypt(data, key1, iv1); } static byte[] decrypt2(byte[] data) { - return DeobUtils.decrypt(data, key2, iv2); + return DeobUtils.aesDecrypt(data, key2, iv2); } } } diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs index b4770133..6d28d386 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/v3/MemoryPatcher.cs @@ -121,7 +121,7 @@ namespace de4dot.code.deobfuscators.dotNET_Reactor.v3 { writer.Write(value); byte[] decrypted; try { - decrypted = DeobUtils.decrypt(memStream.ToArray(), decryptMethod.Key, decryptMethod.Iv); + decrypted = DeobUtils.aesDecrypt(memStream.ToArray(), decryptMethod.Key, decryptMethod.Iv); } catch { return null;