Fix AntiTamper compatibility with mixed mode

yck1509 · Jan 7, 2015 · 2f10e00 · 2f10e00
1 parent 4f83c6a
commit 2f10e00
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/Confuser.Protections/AntiTamper/JITMode.cs b/Confuser.Protections/AntiTamper/JITMode.cs
@@ -244,8 +244,18 @@ void EncryptSection(ModuleWriterBase writer) {
 			stream.Position += 2 + optSize;
 
 			uint encLoc = 0, encSize = 0;
+			int origSects = -1;
+			if (writer is NativeModuleWriter && writer.Module is ModuleDefMD)
+				origSects = ((ModuleDefMD)writer.Module).MetaData.PEImage.ImageSectionHeaders.Count;
 			for (int i = 0; i < sections; i++) {
-				uint nameHash = reader.ReadUInt32() * reader.ReadUInt32();
+				uint nameHash;
+				if (origSects > 0) {
+					origSects--;
+					stream.Write(new byte[8], 0, 8);
+					nameHash = 0;
+				}
+				else
+					nameHash = reader.ReadUInt32() * reader.ReadUInt32();
 				stream.Position += 8;
 				if (nameHash == name1 * name2) {
 					encSize = reader.ReadUInt32();
@@ -256,6 +266,8 @@ void EncryptSection(ModuleWriterBase writer) {
 					uint sectLoc = reader.ReadUInt32();
 					Hash(stream, reader, sectLoc, sectSize);
 				}
+				else
+					stream.Position += 8;
 				stream.Position += 16;
 			}
 

diff --git a/Confuser.Protections/AntiTamper/NormalMode.cs b/Confuser.Protections/AntiTamper/NormalMode.cs
@@ -185,8 +185,18 @@ void EncryptSection(ModuleWriterBase writer) {
 			stream.Position += 2 + optSize;
 
 			uint encLoc = 0, encSize = 0;
+			int origSects = -1;
+			if (writer is NativeModuleWriter && writer.Module is ModuleDefMD)
+				origSects = ((ModuleDefMD)writer.Module).MetaData.PEImage.ImageSectionHeaders.Count;
 			for (int i = 0; i < sections; i++) {
-				uint nameHash = reader.ReadUInt32() * reader.ReadUInt32();
+				uint nameHash;
+				if (origSects > 0) {
+					origSects--;
+					stream.Write(new byte[8], 0, 8);
+					nameHash = 0;
+				}
+				else
+					nameHash = reader.ReadUInt32() * reader.ReadUInt32();
 				stream.Position += 8;
 				if (nameHash == name1 * name2) {
 					encSize = reader.ReadUInt32();
@@ -197,6 +207,8 @@ void EncryptSection(ModuleWriterBase writer) {
 					uint sectLoc = reader.ReadUInt32();
 					Hash(stream, reader, sectLoc, sectSize);
 				}
+				else
+					stream.Position += 8;
 				stream.Position += 16;
 			}