Minor fixes/modification

yck1509 · Dec 23, 2014 · e0d6051 · e0d6051
1 parent 5f37fe4
commit e0d6051
Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Confuser.Core/ProtectionPipeline.cs b/Confuser.Core/ProtectionPipeline.cs
@@ -173,7 +173,7 @@ private static IList<IDnlibDef> Filter(ConfuserContext context, IList<IDnlibDef>
 				ProtectionSettings parameters = ProtectionParameters.GetParameters(context, def);
 				Debug.Assert(parameters != null);
 				if (parameters == null) {
-					context.Logger.ErrorFormat("'{0}' not marked for obfuscation, possibly a bug.");
+					context.Logger.ErrorFormat("'{0}' not marked for obfuscation, possibly a bug.", def);
 					throw new ConfuserException(null);
 				}
 				return parameters.ContainsKey(phase.Parent);

diff --git a/Confuser.Protections/AntiTamper/AntiTamperProtection.cs b/Confuser.Protections/AntiTamper/AntiTamperProtection.cs
@@ -5,8 +5,14 @@
 using dnlib.DotNet;
 
 namespace Confuser.Protections {
+	public interface IAntiTamperService {
+
+		void ExcludeMethod(ConfuserContext context, MethodDef method);
+
+	}
+
 	[BeforeProtection("Ki.ControlFlow"), AfterProtection("Ki.Constants")]
-	internal class AntiTamperProtection : Protection {
+	internal class AntiTamperProtection : Protection, IAntiTamperService {
 
 		public const string _Id = "anti tamper";
 		public const string _FullId = "Ki.AntiTamper";
@@ -34,7 +40,7 @@ public override ProtectionPreset Preset {
 		}
 
 		protected override void Initialize(ConfuserContext context) {
-			//
+			context.Registry.RegisterService(_ServiceId, typeof(IAntiTamperService), this);
 		}
 
 		protected override void PopulatePipeline(ProtectionPipeline pipeline) {

diff --git a/Confuser.Protections/AntiTamper/JITMode.cs b/Confuser.Protections/AntiTamper/JITMode.cs
@@ -140,6 +140,13 @@ public void HandleInject(AntiTamperProtection parent, ConfuserContext context, P
 		}
 
 		public void HandleMD(AntiTamperProtection parent, ConfuserContext context, ProtectionParameters parameters) {
+			// move initialization away from module initializer
+			cctorRepl.Body = cctor.Body;
+			cctor.Body = new CilBody();
+			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Call, initMethod));
+			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Call, cctorRepl));
+			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
+
 			methods = parameters.Targets.OfType<MethodDef>().Where(method => method.HasBody).ToList();
 			context.CurrentModuleWriterListener.OnWriterEvent += OnWriterEvent;
 		}
@@ -199,13 +206,6 @@ private void CreateSection(ModuleWriter writer) {
 			var bodyIndex = new JITBodyIndex(methods.Select(method => writer.MetaData.GetToken(method).Raw));
 			newSection.Add(bodyIndex, 0x10);
 
-			// move initialization away from module initializer
-			cctorRepl.Body = cctor.Body;
-			cctor.Body = new CilBody();
-			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Call, initMethod));
-			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Call, cctorRepl));
-			cctor.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
-
 			// save methods
 			foreach (MethodDef method in methods.WithProgress(context.Logger)) {
 				if (!method.HasBody)

diff --git a/Confuser.Protections/ControlFlow/ExpressionPredicate.cs b/Confuser.Protections/ControlFlow/ExpressionPredicate.cs
@@ -34,7 +34,7 @@ public void Init(CilBody body) {
 		public void EmitSwitchLoad(IList<Instruction> instrs) {
 			instrs.Add(Instruction.Create(OpCodes.Stloc, stateVar));
 			foreach (Instruction instr in invCompiled)
-				instrs.Add(instr);
+				instrs.Add(instr.Clone());
 		}
 
 		public int GetSwitchKey(int key) {