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

CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags.

Browse source 
--see https://github.com/Proxmark/proxmark3/issues/96
      -- still todo,  finding a good way of detecting Magic Ultralight-C tags.
      -- thanks @marshmellow for pointing out proper UL-C tags responses is different.
This commit is contained in:
iceman1001 2015-04-28 20:58:18 +02:00
commit 466bc4599c
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/cmdhf14a.c
View file

@ -163,17 +163,10 @@ int CmdHF14AReader(const char *Cmd)
return 0; return 0;
} }
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen)); 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]); PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
// 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]));
}
switch (card.sak) { switch (card.sak) {
case 0x00: case 0x00:
// check if the tag answers to GETVERSION (0x60) // check if the tag answers to GETVERSION (0x60)
@ -186,13 +179,13 @@ int CmdHF14AReader(const char *Cmd)
uint8_t version[8] = {0x00}; uint8_t version[8] = {0x00};
memcpy(&version, resp.d.asBytes, resp.arg[0]); memcpy(&version, resp.d.asBytes, resp.arg[0]);
uint8_t isOK = resp.arg[0] & 0xff; uint8_t len = resp.arg[0] & 0xff;
if ( isOK ){ switch ( len){
// size of tag, check version[4] == 0x0b == smaller. // todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128); // 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;
else { case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
} }
break; break;
@ -212,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