RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: 'hf iclass dump' - output fixes

Browse source 
CHG:  'hf iclass readtagfile' - output fixes
This commit is contained in:
iceman1001 2016-12-08 18:02:48 +01:00
parent 541231b805
commit c5af4b5d8c
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
client/cmdhficlass.c
View file

@ -769,7 +769,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
if (have_debit_key) memcpy(tag_data+(3*8),div_key,8); if (have_debit_key) memcpy(tag_data+(3*8),div_key,8);
if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8); if (have_credit_key) memcpy(tag_data+(4*8),c_div_key,8);
// print the dump // print the dump
printf("CSN |00| %s |\n", sprint_hex(tag_data, 8)); printf("------+--+-------------------------+\n");
printf("CSN |00| %s|\n", sprint_hex(tag_data, 8)); printf("CSN |00| %s|\n", sprint_hex(tag_data, 8));
printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8); printIclassDumpContents(tag_data, 1, (gotBytes/8)-1, gotBytes-8);
@ -1263,6 +1263,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
int i = startblock; int i = startblock;
int j; int j;
printf("------+--+-------------------------+\n");
while (i <= endblock){ while (i <= endblock){
printf("Block |%02X| ",i); printf("Block |%02X| ",i);
memcpy(blockdata, iclass_dump + (i * 8), 8); memcpy(blockdata, iclass_dump + (i * 8), 8);
@ -1271,6 +1272,7 @@ void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t e
printf("|\n"); printf("|\n");
i++; i++;
} }
printf("------+--+-------------------------+\n");
} }
int usage_hf_iclass_readtagfile() { int usage_hf_iclass_readtagfile() {
@ -1318,7 +1320,8 @@ int CmdHFiClassReadTagFile(const char *Cmd) {
fclose(f); fclose(f);
uint8_t *csn = dump; uint8_t *csn = dump;
printf("CSN [00] | %s |\n", sprint_hex(csn, 8) ); printf("------+--+-------------------------+\n");
printf("CSN |00| %s|\n", sprint_hex(csn, 8) );
printIclassDumpContents(dump,startblock,endblock,bytes_read); printIclassDumpContents(dump,startblock,endblock,bytes_read);
free(dump); free(dump);
return 0; return 0;
@ -1377,9 +1380,9 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
xor_div_key[i] = old_div_key[i] ^ new_div_key[i]; xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
} }
if (verbose) { if (verbose) {
printf("Old Div Key : %s\n",sprint_hex(old_div_key,8)); printf("Old div key : %s\n",sprint_hex(old_div_key,8));
printf("New Div Key : %s\n",sprint_hex(new_div_key,8)); printf("New div key : %s\n",sprint_hex(new_div_key,8));
printf("Xor Div Key : %s\n",sprint_hex(xor_div_key,8)); printf("Xor div key : %s\n",sprint_hex(xor_div_key,8));
} }
} }
@ -1397,7 +1400,6 @@ int usage_hf_iclass_calc_newkey(void) {
PrintAndLog(" std key to e key read csn: hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e"); PrintAndLog(" std key to e key read csn: hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
PrintAndLog(" std to std read csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899"); PrintAndLog(" std to std read csn : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
PrintAndLog("NOTE: * = required\n"); PrintAndLog("NOTE: * = required\n");
return 1; return 1;
} }
@ -1520,9 +1522,9 @@ static int loadKeys(char *filename) {
return 0; return 0;
} }
uint8_t i = 0; uint8_t i = 0;
for (; i < bytes_read/8; i++){ for (; i < bytes_read/8; i++)
memcpy(iClass_Key_Table[i],dump+(i*8),8); memcpy(iClass_Key_Table[i],dump+(i*8),8);
}
free(dump); free(dump);
PrintAndLog("%u keys loaded", i); PrintAndLog("%u keys loaded", i);
return 1; return 1;
@ -1547,9 +1549,8 @@ static int saveKeys(char *filename) {
static int printKeys(void) { static int printKeys(void) {
PrintAndLog(""); PrintAndLog("");
for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){ for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++)
PrintAndLog("%u: %s", i, sprint_hex(iClass_Key_Table[i],8)); PrintAndLog("%u: %s", i, sprint_hex(iClass_Key_Table[i],8));
}
PrintAndLog(""); PrintAndLog("");
return 0; return 0;
} }