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: minor code cleaning in 'hf 14a reader'

Browse source
This commit is contained in:
iceman1001 2016-08-10 16:24:49 +02:00
commit 823ad2e186
1 changed files with 22 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

106
client/cmdhf14a.c
View file

@ -179,6 +179,7 @@ int CmdHF14AList(const char *Cmd) {
} }
int CmdHF14AReader(const char *Cmd) { int CmdHF14AReader(const char *Cmd) {
UsbCommand cDisconnect = {CMD_READER_ISO_14443a, {0,0,0}};
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
@ -192,22 +193,14 @@ int CmdHF14AReader(const char *Cmd) {
if(select_status == 0) { if(select_status == 0) {
if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed"); if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
// disconnect SendCommand(&cDisconnect);
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
return 0; return 0;
} }
if(select_status == 3) { if(select_status == 3) {
PrintAndLog("Card doesn't support standard iso14443-3 anticollision"); PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]); PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
// disconnect SendCommand(&cDisconnect);
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
return 0; return 0;
} }
@ -218,13 +211,13 @@ int CmdHF14AReader(const char *Cmd) {
switch (card.sak) { switch (card.sak) {
case 0x00: case 0x00:
//***************************************test**************** // ******** is card of the MFU type (UL/ULC/NTAG/ etc etc)
ul_switch_off_field(); ul_switch_off_field();
uint32_t tagT = GetHF14AMfU_Type(); uint32_t tagT = GetHF14AMfU_Type();
ul_print_type(tagT, 0); ul_print_type(tagT, 0);
//reconnect for further tests // reconnect for further tests
c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT; c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
c.arg[1] = 0; c.arg[1] = 0;
c.arg[2] = 0; c.arg[2] = 0;
@ -233,7 +226,7 @@ int CmdHF14AReader(const char *Cmd) {
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
WaitForResponse(CMD_ACK,&resp); WaitForResponse(CMD_ACK, &resp);
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t)); memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@ -243,27 +236,6 @@ int CmdHF14AReader(const char *Cmd) {
ul_switch_off_field(); ul_switch_off_field();
return 0; return 0;
} }
/* orig
// 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[10] = {0};
memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
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; 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;
@ -379,59 +351,29 @@ int CmdHF14AReader(const char *Cmd) {
PrintAndLog(" %02x -> Length is %d bytes", PrintAndLog(" %02x -> Length is %d bytes",
card.ats[pos + 1], card.ats[pos + 1]); card.ats[pos + 1], card.ats[pos + 1]);
switch (card.ats[pos + 2] & 0xf0) { switch (card.ats[pos + 2] & 0xf0) {
case 0x10: case 0x10: PrintAndLog(" 1x -> MIFARE DESFire"); break;
PrintAndLog(" 1x -> MIFARE DESFire"); case 0x20: PrintAndLog(" 2x -> MIFARE Plus"); break;
break;
case 0x20:
PrintAndLog(" 2x -> MIFARE Plus");
break;
} }
switch (card.ats[pos + 2] & 0x0f) { switch (card.ats[pos + 2] & 0x0f) {
case 0x00: case 0x00: PrintAndLog(" x0 -> <1 kByte"); break;
PrintAndLog(" x0 -> <1 kByte"); case 0x01: PrintAndLog(" x1 -> 1 kByte"); break;
break; case 0x02: PrintAndLog(" x2 -> 2 kByte"); break;
case 0x01: case 0x03: PrintAndLog(" x3 -> 4 kByte"); break;
PrintAndLog(" x1 -> 1 kByte"); case 0x04: PrintAndLog(" x4 -> 8 kByte"); break;
break;
case 0x02:
PrintAndLog(" x2 -> 2 kByte");
break;
case 0x03:
PrintAndLog(" x3 -> 4 kByte");
break;
case 0x04:
PrintAndLog(" x4 -> 8 kByte");
break;
} }
switch (card.ats[pos + 3] & 0xf0) { switch (card.ats[pos + 3] & 0xf0) {
case 0x00: case 0x00: PrintAndLog(" 0x -> Engineering sample"); break;
PrintAndLog(" 0x -> Engineering sample"); case 0x20: PrintAndLog(" 2x -> Released"); break;
break;
case 0x20:
PrintAndLog(" 2x -> Released");
break;
} }
switch (card.ats[pos + 3] & 0x0f) { switch (card.ats[pos + 3] & 0x0f) {
case 0x00: case 0x00: PrintAndLog(" x0 -> Generation 1"); break;
PrintAndLog(" x0 -> Generation 1"); case 0x01: PrintAndLog(" x1 -> Generation 2"); break;
break; case 0x02: PrintAndLog(" x2 -> Generation 3"); break;
case 0x01:
PrintAndLog(" x1 -> Generation 2");
break;
case 0x02:
PrintAndLog(" x2 -> Generation 3");
break;
} }
switch (card.ats[pos + 4] & 0x0f) { switch (card.ats[pos + 4] & 0x0f) {
case 0x00: case 0x00: PrintAndLog(" x0 -> Only VCSL supported"); break;
PrintAndLog(" x0 -> Only VCSL supported"); case 0x01: PrintAndLog(" x1 -> VCS, VCSL, and SVC supported"); break;
break; case 0x0E: PrintAndLog(" xE -> no VCS command supported"); break;
case 0x01:
PrintAndLog(" x1 -> VCS, VCSL, and SVC supported");
break;
case 0x0E:
PrintAndLog(" xE -> no VCS command supported");
break;
} }
} }
} }
@ -454,11 +396,7 @@ int CmdHF14AReader(const char *Cmd) {
PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") ); PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
// disconnect // disconnect
c.cmd = CMD_READER_ISO_14443a; SendCommand(&cDisconnect);
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
return select_status; return select_status;
} }