From d13bbcd466eb93c74ee7d1e3a8b4f56537b51b2b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 19 Aug 2017 16:13:36 +0200
Subject: [PATCH] chg: 'hf iclass sim 2' - added a new set of CSNS.

---
 client/cmdhficlass.c | 52 ++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 6b8e8c479..f4c447569 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -12,11 +12,11 @@
 
 #include "cmdhficlass.h"
 
+#define NUM_CSNS 8
+#define ICLASS_KEYS_MAX 8
+
 static int CmdHelp(const char *Cmd);
 
-#define NUM_CSNS 8
-
-#define ICLASS_KEYS_MAX 8
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
 		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
 		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
@@ -266,26 +266,40 @@ int CmdHFiClassSim(const char *Cmd) {
 		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,NUM_CSNS}};
 		UsbCommand resp = {0};
 
+/*
 		// pre-defined 8 CSN by Holiman
-		// but new entry[0] by iceman
 		uint8_t csns[8*NUM_CSNS] = {		
-			//0X00, 0X0B, 0X0F, 0XFF, 0XF7, 0XFF, 0X12, 0XE0, // 0,1,69
-			0x00, 0x8b, 0x8f, 0x7f, 0xf7, 0xff, 0x12, 0xe0,
-			0X00, 0X13, 0X94, 0X7E, 0X76, 0XFF, 0X12, 0XE0, // 2,12
-			0X2A, 0X99, 0XAC, 0X79, 0XEC, 0XFF, 0X12, 0XE0,	// 7,11
-			0X17, 0X12, 0X01, 0XFD, 0XF7, 0XFF, 0X12, 0XE0, // 3,15
-			0XCD, 0X56, 0X01, 0X7C, 0X6F, 0XFF, 0X12, 0XE0, // 4,8
-			0X4B, 0X5E, 0X0B, 0X72, 0XEF, 0XFF, 0X12, 0XE0, // 6,14
-			0X00, 0X73, 0XD8, 0X75, 0X58, 0XFF, 0X12, 0XE0, // 9,5
-			0X0C, 0X90, 0X32, 0XF3, 0X5D, 0XFF, 0X12, 0XE0  // 10,13
+			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x00, 0x13, 0x94, 0x7E, 0x76, 0xFF, 0x12, 0xE0, 
+			0x2A, 0x99, 0xAC, 0x79, 0xEC, 0xFF, 0x12, 0xE0,	
+			0x17, 0x12, 0x01, 0xFD, 0xF7, 0xFF, 0x12, 0xE0, 
+			0xCD, 0x56, 0x01, 0x7C, 0x6F, 0xFF, 0x12, 0xE0, 
+			0x4B, 0x5E, 0x0B, 0x72, 0xEF, 0xFF, 0x12, 0xE0, 
+			0x00, 0x73, 0xD8, 0x75, 0x58, 0xFF, 0x12, 0xE0, 
+			0x0C, 0x90, 0x32, 0xF3, 0x5D, 0xFF, 0x12, 0xE0  
 		};
-		
-/*		00  13  94  7e  76  ff  12  e0
-		// pre-defined 15 CSN by Carl55
-		// but new entry[0] by iceman
+*/
+/*
+		pre-defined 8 CSN by iceman		
+		only one csn depend on several others. 
+		six depends only on the first csn,  (0,1, 0x45)
+*/
 		uint8_t csns[8*NUM_CSNS] = {
-			//0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-			0x00, 0x8b, 0x8f, 0x7f, 0xf7, 0xff, 0x12, 0xe0,
+			0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0, 
+			0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
+		};
+
+/*
+		// pre-defined 15 CSN by Carl55
+		// remember to change the define NUM_CSNS to match.
+		uint8_t csns[8*NUM_CSNS] = {
+			0x00, 0x0B, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
 			0x00, 0x04, 0x0E, 0x08, 0xF7, 0xFF, 0x12, 0xE0,
 			0x00, 0x09, 0x0D, 0x05, 0xF7, 0xFF, 0x12, 0xE0,
 			0x00, 0x0A, 0x0C, 0x06, 0xF7, 0xFF, 0x12, 0xE0,