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: changed output for the "hf mf nested" to show KEY: A or B instead of 0/1

Browse source
This commit is contained in:
iceman1001 2016-01-16 23:02:54 +01:00
commit 952f3dc78f
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/mifarehost.c
View file

@ -79,23 +79,19 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
struct Crypto1State *p1, *p2, *p3, *p4; struct Crypto1State *p1, *p2, *p3, *p4;
// flush queue // flush queue
clearCommandBuffer();
//WaitForResponseTimeout(CMD_ACK,NULL,100);
UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}}; UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};
memcpy(c.d.asBytes, key, 6); memcpy(c.d.asBytes, key, 6);
clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
return -1;
}
if (resp.arg[0]) { // error during nested
return resp.arg[0]; // error during nested if (resp.arg[0]) return resp.arg[0];
}
memcpy(&uid, resp.d.asBytes, 4); memcpy(&uid, resp.d.asBytes, 4);
PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8); PrintAndLog("UID: %08x Block:%d Key: %c", uid, (uint16_t)resp.arg[2] & 0xff, (resp.arg[2] >> 8) ?'A':'B' );
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
statelists[i].blockNo = resp.arg[2] & 0xff; statelists[i].blockNo = resp.arg[2] & 0xff;