mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
--verbose now also prints the keys
This commit is contained in:
parent
1c07e9d1bb
commit
9d1e75a9b5
1 changed files with 15 additions and 1 deletions
|
@ -245,7 +245,7 @@ static void mf_print_block(uint8_t blockno, uint8_t *d, bool verbose) {
|
||||||
|
|
||||||
uint32_t value = 0;
|
uint32_t value = 0;
|
||||||
if (verbose && mfc_value(d, &value)) {
|
if (verbose && mfc_value(d, &value)) {
|
||||||
PrintAndLogEx(INFO, "%3d | " _CYAN_("%s") " %"PRIu32 , blockno, sprint_hex_ascii(d, MFBLOCK_SIZE), value);
|
PrintAndLogEx(INFO, "%3d | " _CYAN_("%s") " %"PRIu32, blockno, sprint_hex_ascii(d, MFBLOCK_SIZE), value);
|
||||||
} else {
|
} else {
|
||||||
PrintAndLogEx(INFO, "%3d | %s ", blockno, sprint_hex_ascii(d, MFBLOCK_SIZE));
|
PrintAndLogEx(INFO, "%3d | %s ", blockno, sprint_hex_ascii(d, MFBLOCK_SIZE));
|
||||||
}
|
}
|
||||||
|
@ -4181,6 +4181,10 @@ static int CmdHF14AMfEView(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
mf_print_blocks(block_cnt, dump, verbose);
|
mf_print_blocks(block_cnt, dump, verbose);
|
||||||
|
|
||||||
|
if (verbose) {
|
||||||
|
mf_print_keys(block_cnt, dump);
|
||||||
|
}
|
||||||
free(dump);
|
free(dump);
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -5067,6 +5071,11 @@ static int CmdHF14AMfCView(const char *Cmd) {
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
mf_print_blocks(block_cnt, dump, verbose);
|
mf_print_blocks(block_cnt, dump, verbose);
|
||||||
|
|
||||||
|
if (verbose) {
|
||||||
|
mf_print_keys(block_cnt, dump);
|
||||||
|
}
|
||||||
|
|
||||||
free(dump);
|
free(dump);
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -6309,6 +6318,11 @@ static int CmdHF14AGen4View(const char *Cmd) {
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
mf_print_blocks(block_cnt, dump, verbose);
|
mf_print_blocks(block_cnt, dump, verbose);
|
||||||
|
|
||||||
|
if (verbose) {
|
||||||
|
mf_print_keys(block_cnt, dump);
|
||||||
|
}
|
||||||
|
|
||||||
free(dump);
|
free(dump);
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue