mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 13:53:55 -07:00
commit
71435fb824
2 changed files with 26 additions and 3 deletions
|
@ -87,6 +87,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
|
||||||
- Added `hf emv scan` - save card's data to json file (@merlokk)
|
- Added `hf emv scan` - save card's data to json file (@merlokk)
|
||||||
- Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
|
- Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
|
||||||
- Added `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
|
- Added `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
|
||||||
|
- Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
|
- Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)
|
||||||
|
|
|
@ -545,12 +545,23 @@ int CmdHF14AMfRdBl(const char *Cmd) {
|
||||||
uint8_t isOK = resp.arg[0] & 0xff;
|
uint8_t isOK = resp.arg[0] & 0xff;
|
||||||
uint8_t *data = resp.d.asBytes;
|
uint8_t *data = resp.d.asBytes;
|
||||||
|
|
||||||
if (isOK)
|
if (isOK) {
|
||||||
PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
|
PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
|
||||||
else
|
} else {
|
||||||
PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
|
PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
|
||||||
|
PrintAndLogEx(NORMAL, "Trailer decoded:");
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
|
||||||
|
}
|
||||||
|
PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
PrintAndLogEx(WARNING, "Command execute timeout");
|
PrintAndLogEx(WARNING, "Command execute timeout");
|
||||||
|
return 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2759,6 +2770,17 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
|
PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
|
||||||
|
|
||||||
|
if (mfIsSectorTrailer(blockNo)) {
|
||||||
|
PrintAndLogEx(NORMAL, "Trailer decoded:");
|
||||||
|
PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
|
||||||
|
PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
|
||||||
|
}
|
||||||
|
PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue