Minor addition to ref proxy API

yck1509 · Nov 18, 2015 · 02492b3 · 02492b3
1 parent b9d74ba
commit 02492b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Confuser.Protections/ReferenceProxy/ReferenceProxyPhase.cs b/Confuser.Protections/ReferenceProxy/ReferenceProxyPhase.cs
@@ -123,6 +123,11 @@ void ProcessMethod(RPContext ctx) {
 				Instruction instr = ctx.Body.Instructions[i];
 				if (instr.OpCode.Code == Code.Call || instr.OpCode.Code == Code.Callvirt || instr.OpCode.Code == Code.Newobj) {
 					var operand = (IMethod)instr.Operand;
+					var def = operand.ResolveMethodDef();
+
+					if (def != null && ctx.Context.Annotations.Get<object>(def, ReferenceProxyProtection.TargetExcluded) != null)
+						return;
+
 					// Call constructor
 					if (instr.OpCode.Code != Code.Newobj && operand.Name == ".ctor")
 						continue;

diff --git a/Confuser.Protections/ReferenceProxy/ReferenceProxyProtection.cs b/Confuser.Protections/ReferenceProxy/ReferenceProxyProtection.cs
@@ -6,6 +6,7 @@
 namespace Confuser.Protections {
 	public interface IReferenceProxyService {
 		void ExcludeMethod(ConfuserContext context, MethodDef method);
+		void ExcludeTarget(ConfuserContext context, MethodDef method);
 	}
 
 	[AfterProtection("Ki.AntiDebug", "Ki.AntiDump")]
@@ -15,6 +16,8 @@ internal class ReferenceProxyProtection : Protection, IReferenceProxyService {
 		public const string _FullId = "Ki.RefProxy";
 		public const string _ServiceId = "Ki.RefProxy";
 
+		internal static object TargetExcluded = new object();
+
 		public override string Name {
 			get { return "Reference Proxy Protection"; }
 		}
@@ -39,6 +42,10 @@ public void ExcludeMethod(ConfuserContext context, MethodDef method) {
 			ProtectionParameters.GetParameters(context, method).Remove(this);
 		}
 
+		public void ExcludeTarget(ConfuserContext context, MethodDef method) {
+			context.Annotations.Set(method, TargetExcluded, TargetExcluded);
+		}
+
 		protected override void Initialize(ConfuserContext context) {
 			context.Registry.RegisterService(_ServiceId, typeof(IReferenceProxyService), this);
 		}