From 362d82504214c085228751af48ab46008cae5ee4 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Tue, 20 Nov 2012 08:02:10 +0100
Subject: [PATCH] Update code since submodule was updated

---
 de4dot.code/deobfuscators/Confuser/AntiDumping.cs         | 4 ++--
 .../deobfuscators/Confuser/ConstantsDecrypterBase.cs      | 8 ++++----
 .../deobfuscators/Confuser/ConstantsDecrypterV17.cs       | 2 +-
 .../deobfuscators/Confuser/ConstantsDecrypterV18.cs       | 4 ++--
 .../deobfuscators/Confuser/MemoryMethodsDecrypter.cs      | 4 ++--
 de4dot.code/deobfuscators/Confuser/StringDecrypter.cs     | 2 +-
 de4dot.code/deobfuscators/Confuser/Unpacker.cs            | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/de4dot.code/deobfuscators/Confuser/AntiDumping.cs b/de4dot.code/deobfuscators/Confuser/AntiDumping.cs
index 55d41f8a..206d4add 100644
--- a/de4dot.code/deobfuscators/Confuser/AntiDumping.cs
+++ b/de4dot.code/deobfuscators/Confuser/AntiDumping.cs
@@ -177,7 +177,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				var ldloc = instrs[i + 5];
 				if (!ldloc.IsLdloc())
 					continue;
-				var local = ldloc.GetLocal(method.Body.LocalList);
+				var local = ldloc.GetLocal(method.Body.Variables);
 				if (local == null)
 					continue;
 
@@ -187,7 +187,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 					continue;
 
 				ldloc = instrs[i + 8];
-				if (!ldloc.IsLdloc() || local != ldloc.GetLocal(method.Body.LocalList))
+				if (!ldloc.IsLdloc() || local != ldloc.GetLocal(method.Body.Variables))
 					continue;
 				if (!instrs[i + 9].IsLdcI4() || instrs[i + 9].GetLdcI4Value() != 4)
 					continue;
diff --git a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterBase.cs b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterBase.cs
index 1c3b78bf..40c1fef1 100644
--- a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterBase.cs
+++ b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterBase.cs
@@ -323,7 +323,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				if (instrs[i + 5].OpCode.Code != Code.And)
 					continue;
 
-				return ldloc.GetLocal(method.Body.LocalList);
+				return ldloc.GetLocal(method.Body.Variables);
 			}
 			return null;
 		}
@@ -333,7 +333,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 			for (int i = 0; i < instrs.Count - 5; i++) {
 				int index = i;
 				var stloc = instrs[index++];
-				if (!stloc.IsStloc() || stloc.GetLocal(method.Body.LocalList) != local)
+				if (!stloc.IsStloc() || stloc.GetLocal(method.Body.Variables) != local)
 					continue;
 				if (!instrs[index++].IsLdloc())
 					continue;
@@ -347,7 +347,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				if (!instrs[index++].IsLdloc())
 					continue;
 				var ldloc = instrs[index++];
-				if (!ldloc.IsLdloc() || ldloc.GetLocal(method.Body.LocalList) != local)
+				if (!ldloc.IsLdloc() || ldloc.GetLocal(method.Body.Variables) != local)
 					continue;
 				if (instrs[index++].OpCode.Code != Code.Conv_U1)
 					continue;
@@ -363,7 +363,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 			var instrs = method.Body.Instructions;
 			for (int i = 0; i < instrs.Count - 11; i++) {
 				var stloc = instrs[i];
-				if (!stloc.IsStloc() || stloc.GetLocal(method.Body.LocalList) != local)
+				if (!stloc.IsStloc() || stloc.GetLocal(method.Body.Variables) != local)
 					continue;
 				if (!instrs[i + 1].IsLdloc())
 					continue;
diff --git a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV17.cs b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV17.cs
index 9290bf4e..44279f39 100644
--- a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV17.cs
+++ b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV17.cs
@@ -89,7 +89,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 					var ldcloc = instrs[i + 2];
 					if (!ldcloc.IsLdloc())
 						continue;
-					if (stloc.GetLocal(method.Body.LocalList) != ldcloc.GetLocal(method.Body.LocalList))
+					if (stloc.GetLocal(method.Body.Variables) != ldcloc.GetLocal(method.Body.Variables))
 						continue;
 					if (instrs[i + 3].OpCode.Code != Code.Xor)
 						continue;
diff --git a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV18.cs b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV18.cs
index db32a82c..6302e575 100644
--- a/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV18.cs
+++ b/de4dot.code/deobfuscators/Confuser/ConstantsDecrypterV18.cs
@@ -585,7 +585,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 			var instrs = installMethod.Body.Instructions;
 			for (int i = startIndex; i < instrs.Count; i++) {
 				var instr = instrs[i];
-				if (instr.IsStloc() && instr.GetLocal(installMethod.Body.LocalList) == local)
+				if (instr.IsStloc() && instr.GetLocal(installMethod.Body.Variables) == local)
 					return i;
 			}
 			return -1;
@@ -607,7 +607,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 					continue;
 
 				instrIndex = index;
-				return ldloc.GetLocal(installMethod.Body.LocalList);
+				return ldloc.GetLocal(installMethod.Body.Variables);
 			}
 			instrIndex = 0;
 			return null;
diff --git a/de4dot.code/deobfuscators/Confuser/MemoryMethodsDecrypter.cs b/de4dot.code/deobfuscators/Confuser/MemoryMethodsDecrypter.cs
index bec1fa05..d86c4e0e 100644
--- a/de4dot.code/deobfuscators/Confuser/MemoryMethodsDecrypter.cs
+++ b/de4dot.code/deobfuscators/Confuser/MemoryMethodsDecrypter.cs
@@ -218,7 +218,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				var ldloc = instrs[i + 4];
 				if (!ldloc.IsLdloc())
 					continue;
-				if (ldloc.GetLocal(method.Body.LocalList) != stloc.GetLocal(method.Body.LocalList))
+				if (ldloc.GetLocal(method.Body.Variables) != stloc.GetLocal(method.Body.Variables))
 					continue;
 
 				key = (uint)ldci4.GetLdcI4Value();
@@ -252,7 +252,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				var ldloc = instrs[i + 4];
 				if (!ldloc.IsLdloc())
 					continue;
-				if (ldloc.GetLocal(method.Body.LocalList) == stloc.GetLocal(method.Body.LocalList))
+				if (ldloc.GetLocal(method.Body.Variables) == stloc.GetLocal(method.Body.Variables))
 					continue;
 				if (!instrs[i + 5].IsLdloc())
 					continue;
diff --git a/de4dot.code/deobfuscators/Confuser/StringDecrypter.cs b/de4dot.code/deobfuscators/Confuser/StringDecrypter.cs
index 61d7746f..e85dfb60 100644
--- a/de4dot.code/deobfuscators/Confuser/StringDecrypter.cs
+++ b/de4dot.code/deobfuscators/Confuser/StringDecrypter.cs
@@ -167,7 +167,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 						continue;
 					if (!instrs[i + 3].IsStloc())
 						continue;
-					return instrs[i + 3].GetLocal(method.Body.LocalList);
+					return instrs[i + 3].GetLocal(method.Body.Variables);
 				}
 				return null;
 			}
diff --git a/de4dot.code/deobfuscators/Confuser/Unpacker.cs b/de4dot.code/deobfuscators/Confuser/Unpacker.cs
index 424fe769..8ba63389 100644
--- a/de4dot.code/deobfuscators/Confuser/Unpacker.cs
+++ b/de4dot.code/deobfuscators/Confuser/Unpacker.cs
@@ -289,7 +289,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 			var stloc = instrs[3];
 			if (!stloc.IsStloc())
 				return false;
-			var local = stloc.GetLocal(method.Body.LocalList);
+			var local = stloc.GetLocal(method.Body.Variables);
 			if (local == null || local.Type.FullName != "System.IO.BinaryReader")
 				return false;