X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..f5ed4d12de19dcf59a3d5ecdcd9f75f5c747dd3e:/client/cmdhficlass.c

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index bd215a61..e033422a 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -55,7 +55,7 @@ int CmdHFiClassList(const char *Cmd)
 		return 0;
 	}
 
-	uint8_t got[1920];
+	uint8_t got[TRACE_BUFFER_SIZE];
 	GetFromBigBuf(got,sizeof(got),0);
 	WaitForResponse(CMD_ACK,NULL);
 
@@ -77,7 +77,7 @@ int CmdHFiClassList(const char *Cmd)
 	uint32_t EndOfTransmissionTimestamp = 0;
 
 
-	for( i=0; i < 1900;)
+	for( i=0; i < TRACE_BUFFER_SIZE;)
 	{
 		//First 32 bits contain
 		// isResponse (1 bit)
@@ -302,7 +302,7 @@ int CmdHFiClassSnoop(const char *Cmd)
   SendCommand(&c);
   return 0;
 }
-
+#define NUM_CSNS 15
 int CmdHFiClassSim(const char *Cmd)
 {
   uint8_t simType = 0;
@@ -339,10 +339,10 @@ int CmdHFiClassSim(const char *Cmd)
 
 	if(simType == 2)
 	{
-		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,63}};
+		UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,NUM_CSNS}};
 		UsbCommand resp = {0};
 
-		uint8_t csns[64] = {
+		/*uint8_t csns[8 * NUM_CSNS] = {
 			 0x00,0x0B,0x0F,0xFF,0xF7,0xFF,0x12,0xE0 ,
 			 0x00,0x13,0x94,0x7e,0x76,0xff,0x12,0xe0 ,
 			 0x2a,0x99,0xac,0x79,0xec,0xff,0x12,0xe0 ,
@@ -351,8 +351,26 @@ int CmdHFiClassSim(const char *Cmd)
 			 0x4b,0x5e,0x0b,0x72,0xef,0xff,0x12,0xe0 ,
 			 0x00,0x73,0xd8,0x75,0x58,0xff,0x12,0xe0 ,
 			 0x0c,0x90,0x32,0xf3,0x5d,0xff,0x12,0xe0 };
-
-		memcpy(c.d.asBytes, csns, 64);
+*/
+      
+	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,
+	 0x00, 0x0F, 0x0B, 0x03, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x08, 0x0A, 0x0C, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x0D, 0x09, 0x09, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x0E, 0x08, 0x0A, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x03, 0x07, 0x17, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x3C, 0x06, 0xE0, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x01, 0x05, 0x1D, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x02, 0x04, 0x1E, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x07, 0x03, 0x1B, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x00, 0x02, 0x24, 0xF7, 0xFF, 0x12, 0xE0,
+	 0x00, 0x05, 0x01, 0x21, 0xF7, 0xFF, 0x12, 0xE0 };
+	
+	 memcpy(c.d.asBytes, csns, 8*NUM_CSNS);
 
 		SendCommand(&c);
 		if (!WaitForResponseTimeout(CMD_ACK, &resp, -1)) {
@@ -361,9 +379,9 @@ int CmdHFiClassSim(const char *Cmd)
 		}
 
 		uint8_t num_mac_responses  = resp.arg[1];
-		PrintAndLog("Mac responses: %d MACs obtained (should be 8)", num_mac_responses);
+		PrintAndLog("Mac responses: %d MACs obtained (should be %d)", num_mac_responses, NUM_CSNS);
 
-		size_t datalen = 8*24;
+		size_t datalen = NUM_CSNS*24;
 		/*
 		 * Now, time to dump to file. We'll use this format:
 		 * <8-byte CSN><8-byte CC><4 byte NR><4 byte MAC>....
@@ -377,7 +395,7 @@ int CmdHFiClassSim(const char *Cmd)
 		void* dump = malloc(datalen);
 		memset(dump,0,datalen);//<-- Need zeroes for the CC-field
 		uint8_t i = 0;
-		for(i = 0 ; i < 8 ; i++)
+		for(i = 0 ; i < NUM_CSNS ; i++)
 		{
 			memcpy(dump+i*24, csns+i*8,8); //CSN
 			//8 zero bytes here...
@@ -494,15 +512,31 @@ int CmdHFiClassReader_Dump(const char *Cmd)
 
   }
 
+  UsbCommand resp;
+  uint8_t key_sel[8] = {0};
+  uint8_t key_sel_p[8] = { 0 };
+
+  //HACK -- Below is for testing without access to a tag
+  uint8_t fake_dummy_test = false;
+  if(fake_dummy_test)
+  {
+    uint8_t xdata[16] = {0x01,0x02,0x03,0x04,0xF7,0xFF,0x12,0xE0, //CSN from http://www.proxmark.org/forum/viewtopic.php?pid=11230#p11230
+                        0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; // Just a random CC. Would be good to add a real testcase here
+    memcpy(resp.d.asBytes,xdata, 16);
+    resp.arg[0] = 2;    
+  }
+  
+  //End hack
+
 
   UsbCommand c = {CMD_READER_ICLASS, {0}};
   c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE;
-
+  if(!fake_dummy_test)   
   SendCommand(&c);
   
-  UsbCommand resp;
 
-  if (WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
+
+  if (fake_dummy_test || WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
         uint8_t isOK    = resp.arg[0] & 0xff;
         uint8_t * data  = resp.d.asBytes;
 
@@ -519,8 +553,6 @@ int CmdHFiClassReader_Dump(const char *Cmd)
         {
             if(elite)
             {
-                uint8_t key_sel[8] = {0};
-                uint8_t key_sel_p[8] = { 0 };
                 //Get the key index (hash1)
                 uint8_t key_index[8] = {0};
 
@@ -528,6 +560,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                 printvar("hash1", key_index,8);
                 for(i = 0; i < 8 ; i++)
                     key_sel[i] = keytable[key_index[i]] & 0xFF;
+                PrintAndLog("Pre-fortified 'permuted' HS key that would be needed by an iclass reader to talk to above CSN:");
                 printvar("k_sel", key_sel,8);
                 //Permute from iclass format to standard format
                 permutekey_rev(key_sel,key_sel_p);
@@ -544,8 +577,11 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                 used_key = KEY;
 
             }
+
+            PrintAndLog("Pre-fortified key that would be needed by the OmniKey reader to talk to above CSN:");
             printvar("Used key",used_key,8);
             diversifyKey(CSN,used_key, div_key);
+            PrintAndLog("Hash0, a.k.a diversified key, that is computed using Ksel and stored in the card (Block 3):");
             printvar("Div key", div_key, 8);
             printvar("CC_NR:",CCNR,12);
             doMAC(CCNR,12,div_key, MAC);
@@ -553,7 +589,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
 
             UsbCommand d = {CMD_READER_ICLASS_REPLAY, {readerType}};
             memcpy(d.d.asBytes, MAC, 4);
-            SendCommand(&d);
+            if(!fake_dummy_test) SendCommand(&d);
 
         }else{
             PrintAndLog("Failed to obtain CC! Aborting");