master was updated

This commit is contained in:
de4dot 2012-02-26 22:57:55 +01:00
parent cf76c14b4b
commit cee04d3bba
2 changed files with 9 additions and 5 deletions

View File

@ -84,7 +84,7 @@ namespace de4dot.code.deobfuscators.MaxtoCode {
mainType.find();
}
public override bool getDecryptedModule(ref byte[] newFileData, ref Dictionary<uint, DumpedMethod> dumpedMethods) {
public override bool getDecryptedModule(ref byte[] newFileData, ref DumpedMethods dumpedMethods) {
if (!mainType.Detected)
return false;
@ -113,5 +113,9 @@ namespace de4dot.code.deobfuscators.MaxtoCode {
addTypeToBeRemoved(mainType.Type, "Obfuscator type");
addModuleReferencesToBeRemoved(mainType.ModuleReferences, "MC runtime module reference");
}
public override IEnumerable<int> getStringDecrypterMethods() {
return new List<int>();
}
}
}

View File

@ -569,7 +569,7 @@ namespace de4dot.code.deobfuscators.MaxtoCode {
this.mainType = mainType;
}
public bool decrypt(byte[] fileData, ref Dictionary<uint, DumpedMethod> dumpedMethods) {
public bool decrypt(byte[] fileData, ref DumpedMethods dumpedMethods) {
var peImage = new PeImage(fileData);
var peHeader = new PeHeader(mainType, peImage);
var mcHeader = new McHeader(peImage, peHeader);
@ -583,8 +583,8 @@ namespace de4dot.code.deobfuscators.MaxtoCode {
return true;
}
Dictionary<uint, DumpedMethod> decryptMethods(PeImage peImage, PeHeader peHeader, McHeader mcHeader) {
var dumpedMethods = new Dictionary<uint, DumpedMethod>();
DumpedMethods decryptMethods(PeImage peImage, PeHeader peHeader, McHeader mcHeader) {
var dumpedMethods = new DumpedMethods();
var methodInfos = new MethodInfos(mainType, peImage, peHeader, mcHeader);
methodInfos.initializeInfos();
@ -638,7 +638,7 @@ namespace de4dot.code.deobfuscators.MaxtoCode {
dm.extraSections = reader.ReadBytes((int)(reader.BaseStream.Length - reader.BaseStream.Position));
}
dumpedMethods[dm.token] = dm;
dumpedMethods.add(dm);
}
return dumpedMethods;