X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b82de75f4a74b2d7f149dc161f0d3a3fb1752fa..7c756d68925891ec3d3aa0bec89ec215fd449bd1:/client/cmdhficlass.c?ds=sidebyside

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 0650eef9..bd215a61 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -16,12 +16,11 @@
 #include <sys/stat.h>
 #include "iso14443crc.h" // Can also be used for iClass, using 0xE012 as CRC-type
 #include "data.h"
-//#include "proxusb.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhficlass.h"
-#include "common.h"
+#include "../include/common.h"
 #include "util.h"
 #include "cmdmain.h"
 #include "loclass/des.h"
@@ -35,11 +34,11 @@ static int CmdHelp(const char *Cmd);
 
 int xorbits_8(uint8_t val)
 {
-    uint8_t res = val ^ (val >> 1); //1st pass
-    res = res ^ (res >> 1); 		// 2nd pass
-    res = res ^ (res >> 2); 		// 3rd pass
-    res = res ^ (res >> 4); 			// 4th pass
-    return res & 1;
+	uint8_t res = val ^ (val >> 1); //1st pass
+	res = res ^ (res >> 1); 		// 2nd pass
+	res = res ^ (res >> 2); 		// 3rd pass
+	res = res ^ (res >> 4); 			// 4th pass
+	return res & 1;
 }
 
 int CmdHFiClassList(const char *Cmd)
@@ -88,7 +87,7 @@ int CmdHFiClassList(const char *Cmd)
 		timestamp = *((uint32_t *)(got+i));
 		parityBits = *((uint32_t *)(got+i+4));
 		len = got[i+8];
-        frame = (got+i+9);
+		frame = (got+i+9);
 		uint32_t next_timestamp = (*((uint32_t *)(got+i+9))) & 0x7fffffff;
 
 		tagToReader = timestamp & 0x80000000;
@@ -437,7 +436,7 @@ int CmdHFiClassReader_Replay(const char *Cmd)
   if (strlen(Cmd)<1) {
     PrintAndLog("Usage:  hf iclass replay <MAC>");
     PrintAndLog("        sample: hf iclass replay 00112233");
-    return 0;
+	return 0;
   }
 
   if (param_gethex(Cmd, 0, MAC, 8)) {
@@ -491,6 +490,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
 
     //calc h2
     hash2(KEY, keytable);
+    printarr_human_readable("keytable", keytable, 128);
 
   }
 
@@ -533,13 +533,21 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                 permutekey_rev(key_sel,key_sel_p);
                 used_key = key_sel_p;
             }else{
+                //Perhaps this should also be permuted to std format?
+                // Something like the code below? I have no std system
+                // to test this with /Martin
+
+                //uint8_t key_sel_p[8] = { 0 };
+                //permutekey_rev(KEY,key_sel_p);
+                //used_key = key_sel_p;
+
                 used_key = KEY;
 
             }
-            printvar("CC:",CCNR,8);
             printvar("Used key",used_key,8);
             diversifyKey(CSN,used_key, div_key);
             printvar("Div key", div_key, 8);
+            printvar("CC_NR:",CCNR,12);
             doMAC(CCNR,12,div_key, MAC);
             printvar("MAC", MAC, 4);
 
@@ -638,14 +646,17 @@ int CmdHFiClass_iso14443A_write(const char *Cmd)
 
 static command_t CommandTable[] = 
 {
-  {"help",	CmdHelp,			1,	"This help"},
-  {"list",	CmdHFiClassList,	0,	"List iClass history"},
-  {"snoop",	CmdHFiClassSnoop,	0,	"Eavesdrop iClass communication"},
-  {"sim",	CmdHFiClassSim,		0,	"Simulate iClass tag"},
+  {"help",    CmdHelp,        1, "This help"},
+  {"list",    CmdHFiClassList,   0, "List iClass history"},
+  {"snoop",   CmdHFiClassSnoop,  0, "Eavesdrop iClass communication"},
+  {"sim",     CmdHFiClassSim,    0, "Simulate iClass tag"},
   {"reader",CmdHFiClassReader,	0,	"Read an iClass tag"},
   {"replay",CmdHFiClassReader_Replay,	0,	"Read an iClass tag via Reply Attack"},
   {"dump",	CmdHFiClassReader_Dump,	0,		"Authenticate and Dump iClass tag"},
   {"write",	CmdHFiClass_iso14443A_write,	0,	"Authenticate and Write iClass block"},
+  {"replay",  CmdHFiClassReader_Replay, 0, "Read an iClass tag via Reply Attack"},
+  {"dump",	  CmdHFiClassReader_Dump, 0, "Authenticate and Dump iClass tag"},
+  {"write",	CmdHFiClass_iso14443A_write,	0,	"Authenticate and Write iClass block"},
   {NULL, NULL, 0, NULL}
 };
 
@@ -658,5 +669,5 @@ int CmdHFiClass(const char *Cmd)
 int CmdHelp(const char *Cmd)
 {
   CmdsHelp(CommandTable);
-  return 0;
+	return 0;
 }