github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Iceman's Issue #96 fix

Browse source
This commit is contained in:
marshmellow42 2015-04-28 15:35:23 -04:00
commit 4745afb647
1 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

49
client/cmdhf14a.c
View file

@ -152,18 +152,43 @@ int CmdHF14AReader(const char *Cmd)
return 0; return 0;
} }
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]); if(select_status == 3) {
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen)); PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]); PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
// disconnect
// Double & triple sized UID, can be mapped to a manufacturer. c.arg[0] = 0;
// HACK: does this apply for Ultralight cards? c.arg[1] = 0;
if ( card.uidlen > 4 ) { c.arg[2] = 0;
PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0])); SendCommand(&c);
return 0;
} }
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
switch (card.sak) { switch (card.sak) {
case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break; case 0x00:
// check if the tag answers to GETVERSION (0x60)
c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
c.arg[1] = 1;
c.arg[2] = 0;
c.d.asBytes[0] = 0x60;
SendCommand(&c);
WaitForResponse(CMD_ACK,&resp);
uint8_t version[8] = {0,0,0,0,0,0,0,0};
memcpy(&version, resp.d.asBytes, resp.arg[0]);
uint8_t len = resp.arg[0] & 0xff;
switch ( len ){
// todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
// UL-EV1, size, check version[6] == 0x0b (smaller) 0x0b * 4 == 48
case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);break;
case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
}
break;
case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break; case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break; case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break; case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
@ -180,6 +205,12 @@ int CmdHF14AReader(const char *Cmd)
default: ; default: ;
} }
// Double & triple sized UID, can be mapped to a manufacturer.
// HACK: does this apply for Ultralight cards?
if ( card.uidlen > 4 ) {
PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
}
// try to request ATS even if tag claims not to support it // try to request ATS even if tag claims not to support it
if (select_status == 2) { if (select_status == 2) {
uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0 uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0