github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: 'hf iclass chk' - adjustments to output

Browse source
This commit is contained in:
iceman1001 2017-12-13 10:40:20 +01:00
commit c50c0e49d6
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhficlass.c
View file

@ -788,8 +788,8 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
} }
static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) { static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
uint8_t CSN[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
uint8_t CCNR[12]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
if (!select_only(CSN, CCNR, use_credit_key, verbose)) if (!select_only(CSN, CCNR, use_credit_key, verbose))
return false; return false;
@ -800,7 +800,7 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
else else
HFiClassCalcDivKey(CSN, KEY, div_key, elite); HFiClassCalcDivKey(CSN, KEY, div_key, elite);
PrintAndLog("Authing with %s: %02x%02x%02x%02x%02x%02x%02x%02x", rawkey ? "raw key" : "diversified key", div_key[0],div_key[1],div_key[2],div_key[3],div_key[4],div_key[5],div_key[6],div_key[7]); if (verbose) PrintAndLog("Authing with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8) );
doMAC(CCNR, div_key, MAC); doMAC(CCNR, div_key, MAC);
UsbCommand resp; UsbCommand resp;
@ -809,12 +809,12 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&d); SendCommand(&d);
if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) { if (!WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
PrintAndLog("Auth Command execute timeout"); if (verbose) PrintAndLog("Auth Command execute timeout");
return false; return false;
} }
uint8_t isOK = resp.arg[0] & 0xff; uint8_t isOK = resp.arg[0] & 0xff;
if (!isOK) { if (!isOK) {
PrintAndLog("Authentication error"); if (verbose) PrintAndLog("Authentication error");
return false; return false;
} }
return true; return true;
@ -1895,6 +1895,8 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
break; break;
} }
memcpy(key, keyBlock + 8 * c , 8);
// debit key. try twice // debit key. try twice
if ( !found_debit ) { if ( !found_debit ) {
for (int foo = 0; foo < 2; foo++) { for (int foo = 0; foo < 2; foo++) {