From ad8a5078fe568b588ee3f5ae3489ac790e4fc356 Mon Sep 17 00:00:00 2001 From: de4dot Date: Tue, 7 Feb 2012 00:42:32 +0100 Subject: [PATCH] Rename method --- .../deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs | 6 +++--- de4dot.code/deobfuscators/CodeVeil/v3_v4/StringDecrypter.cs | 6 +++--- de4dot.code/deobfuscators/DeobUtils.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/de4dot.code/deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs index b6adea40..c7566cb3 100644 --- a/de4dot.code/deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs +++ b/de4dot.code/deobfuscators/CodeVeil/v3_v4/MethodsDecrypter.cs @@ -194,10 +194,10 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 { fileDataReader.BaseStream.Position = codeOffset; if (fileDataReader.ReadByte() != 0x2A) continue; // Not a RET - int methodsDataOffset = DeobUtils.readVariableLengthInteger(fileDataReader); + int methodsDataOffset = DeobUtils.readVariableLengthInt32(fileDataReader); methodsDataReader.BaseStream.Position = methodsDataOffset; - dm.mhCodeSize = (uint)DeobUtils.readVariableLengthInteger(methodsDataReader); + dm.mhCodeSize = (uint)DeobUtils.readVariableLengthInt32(methodsDataReader); dm.code = methodsDataReader.ReadBytes((int)dm.mhCodeSize); if ((dm.mhFlags & 8) != 0) dm.extraSections = readExtraSections(methodsDataReader); @@ -270,7 +270,7 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 { continue; reader.BaseStream.Position = section.pointerToRawData + relOffs; - int size = DeobUtils.readVariableLengthInteger(reader); + int size = DeobUtils.readVariableLengthInt32(reader); int endOffset = relOffs + size; if (endOffset < relOffs || endOffset > section.sizeOfRawData) continue; diff --git a/de4dot.code/deobfuscators/CodeVeil/v3_v4/StringDecrypter.cs b/de4dot.code/deobfuscators/CodeVeil/v3_v4/StringDecrypter.cs index 9ef17e32..9ca98548 100644 --- a/de4dot.code/deobfuscators/CodeVeil/v3_v4/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/CodeVeil/v3_v4/StringDecrypter.cs @@ -189,12 +189,12 @@ namespace de4dot.code.deobfuscators.CodeVeil.v3_v4 { var inflated = DeobUtils.inflate(decryptedData, 0, decryptedData.Length, true); var reader = new BinaryReader(new MemoryStream(inflated)); - int deflatedLength = DeobUtils.readVariableLengthInteger(reader); - int numStrings = DeobUtils.readVariableLengthInteger(reader); + int deflatedLength = DeobUtils.readVariableLengthInt32(reader); + int numStrings = DeobUtils.readVariableLengthInt32(reader); decryptedStrings = new string[numStrings]; var offsets = new int[numStrings]; for (int i = 0; i < numStrings; i++) - offsets[i] = DeobUtils.readVariableLengthInteger(reader); + offsets[i] = DeobUtils.readVariableLengthInt32(reader); int startOffset = (int)reader.BaseStream.Position; for (int i = 0; i < numStrings; i++) { reader.BaseStream.Position = startOffset + offsets[i]; diff --git a/de4dot.code/deobfuscators/DeobUtils.cs b/de4dot.code/deobfuscators/DeobUtils.cs index 36455f2f..89c46ed7 100644 --- a/de4dot.code/deobfuscators/DeobUtils.cs +++ b/de4dot.code/deobfuscators/DeobUtils.cs @@ -150,7 +150,7 @@ namespace de4dot.code.deobfuscators { return null; } - public static int readVariableLengthInteger(BinaryReader reader) { + public static int readVariableLengthInt32(BinaryReader reader) { byte b = reader.ReadByte(); if ((b & 0x80) == 0) return b;