mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-22 14:23:50 -07:00
adapted viewing MFC dump files to also colorize ACL + GPB bytes
This commit is contained in:
parent
fe204d8529
commit
a43d8ea9e0
2 changed files with 22 additions and 1 deletions
|
@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
|
||||||
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
||||||
|
|
||||||
## [unreleased][unreleased]
|
## [unreleased][unreleased]
|
||||||
|
- Change viewing MFC dump files - it now colors ACL + GPB bytes (@iceman1001)
|
||||||
- Added `hf mf supercard --furui` - now supports key recovery from Furui detection card. Thanks foxushka! (@iceman1001)
|
- Added `hf mf supercard --furui` - now supports key recovery from Furui detection card. Thanks foxushka! (@iceman1001)
|
||||||
- Added `hf topaz dump --ns` - now supports nosave param (@iceman1001)
|
- Added `hf topaz dump --ns` - now supports nosave param (@iceman1001)
|
||||||
- Changed `hf topaz rdbl` - unified output (@iceman1001)
|
- Changed `hf topaz rdbl` - unified output (@iceman1001)
|
||||||
|
|
|
@ -251,7 +251,27 @@ static void mf_print_block(uint8_t blockno, uint8_t *d, bool verbose) {
|
||||||
if (blockno == 0) {
|
if (blockno == 0) {
|
||||||
PrintAndLogEx(INFO, "%s| %3d | " _RED_("%s"), secstr, blockno, sprint_hex_ascii(d, MFBLOCK_SIZE));
|
PrintAndLogEx(INFO, "%s| %3d | " _RED_("%s"), secstr, blockno, sprint_hex_ascii(d, MFBLOCK_SIZE));
|
||||||
} else if (mfIsSectorTrailer(blockno)) {
|
} else if (mfIsSectorTrailer(blockno)) {
|
||||||
PrintAndLogEx(INFO, "%s| %3d | " _YELLOW_("%s"), secstr, blockno, sprint_hex_ascii(d, MFBLOCK_SIZE));
|
|
||||||
|
char keya[26] = {0};
|
||||||
|
hex_to_buffer((uint8_t *)keya, d, MIFARE_KEY_SIZE, sizeof(keya) - 1, 0, 1, true);
|
||||||
|
|
||||||
|
char acl[20] = {0};
|
||||||
|
hex_to_buffer((uint8_t *)acl, d + MIFARE_KEY_SIZE, 4, sizeof(acl) - 1, 0, 1, true);
|
||||||
|
|
||||||
|
char keyb[26] = {0};
|
||||||
|
hex_to_buffer((uint8_t *)keyb, d + 10, MIFARE_KEY_SIZE, sizeof(keyb) - 1, 0, 1, true);
|
||||||
|
|
||||||
|
char ascii[24] = {0};
|
||||||
|
ascii_to_buffer((uint8_t *)ascii, d, MFBLOCK_SIZE, sizeof(ascii) - 1, 1);
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "%s| %3d | " _YELLOW_("%s") _MAGENTA_("%s") _YELLOW_("%s") "| " _YELLOW_("%s"),
|
||||||
|
secstr,
|
||||||
|
blockno,
|
||||||
|
keya,
|
||||||
|
acl,
|
||||||
|
keyb,
|
||||||
|
ascii
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
int32_t value = 0;
|
int32_t value = 0;
|
||||||
if (verbose && mfc_value(d, &value)) {
|
if (verbose && mfc_value(d, &value)) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue