From: Martin Holst Swende <martin@swende.se>
Date: Thu, 18 Dec 2014 13:41:17 +0000 (+0100)
Subject: Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly... 
X-Git-Tag: v2.0.0-rc1~80^2~1
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0eea34a2a3f01e2fc6c07fc347d71847c3b880be

Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data
---

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d3d6e930..5cfcc46b 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -513,17 +513,27 @@ 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 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;
+  uint8_t fake_dummy_test = false;
+  //End hack
+
 
   UsbCommand c = {CMD_READER_ICLASS, {0}};
   c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE;
-
-  SendCommand(&c);
+  if(!fake_dummy_test)   
+    SendCommand(&c);
   
-  UsbCommand resp;
-  uint8_t key_sel[8] = {0};
-  uint8_t key_sel_p[8] = { 0 };
 
-  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;
 
@@ -547,6 +557,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);
@@ -563,8 +574,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);
@@ -572,7 +586,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");
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 1a464b6c..7dc60396 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -113,9 +113,9 @@ void hash1(uint8_t csn[] , uint8_t k[])
 	k[0] = csn[0]^csn[1]^csn[2]^csn[3]^csn[4]^csn[5]^csn[6]^csn[7];
 	k[1] = csn[0]+csn[1]+csn[2]+csn[3]+csn[4]+csn[5]+csn[6]+csn[7];
 	k[2] = rr(swap( csn[2]+k[1] ));
-	k[3] = rr(swap( csn[3]+k[0] ));
-	k[4] = ~rr(swap( csn[4]+k[2] ))+1;
-	k[5] = ~rr(swap( csn[5]+k[3] ))+1;
+	k[3] = rl(swap( csn[3]+k[0] ));
+	k[4] = ~rr( csn[4]+k[2] )+1;
+	k[5] = ~rl( csn[5]+k[3] )+1;
 	k[6] = rr( csn[6]+(k[4]^0x3c) );
 	k[7] = rl( csn[7]+(k[5]^0xc3) );
 	int i;