github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-15 09:43:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert field on/off in hf 14a reader

Browse source 
fix typo
This commit is contained in:
pwpiwi 2017-11-10 20:11:51 +01:00
parent e464f62258
commit f5adb06fae
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/cmdhf14a.c
View file

@ -132,28 +132,27 @@ int CmdHF14AList(const char *Cmd)
int CmdHF14AReader(const char *Cmd) { int CmdHF14AReader(const char *Cmd) {
uint32_t cm = ISO14A_CONNECT; uint32_t cm = ISO14A_CONNECT;
bool disconnectAfter = false; bool disconnectAfter = true;
int cmdp = 0; int cmdp = 0;
while(param_getchar(Cmd, cmdp) != 0x00) { while(param_getchar(Cmd, cmdp) != 0x00) {
switch(param_getchar(Cmd, cmdp)) { switch(param_getchar(Cmd, cmdp)) {
case 'h': case 'h':
case 'H': case 'H':
PrintAndLog("Usage: hf 14a reader [d] [3]"); PrintAndLog("Usage: hf 14a reader [k|x] [3]");
PrintAndLog(" d drop the signal field after command executed"); PrintAndLog(" k keep the field active after command executed");
PrintAndLog(" x just drop the signal field"); PrintAndLog(" x just drop the signal field");
PrintAndLog(" 3 ISO14443-3 select only (skip RATS)"); PrintAndLog(" 3 ISO14443-3 select only (skip RATS)");
return 0; return 0;
case '3': case '3':
cm |= ISO14A_NO_RATS; cm |= ISO14A_NO_RATS;
break; break;
case 'd': case 'k':
case 'D': case 'K':
disconnectAfter = true; disconnectAfter = false;
break; break;
case 'x': case 'x':
case 'X': case 'X':
disconnectAfter = true;
cm = cm - ISO14A_CONNECT; cm = cm - ISO14A_CONNECT;
break; break;
default: default:
@ -196,10 +195,15 @@ int CmdHF14AReader(const char *Cmd) {
if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len)); PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
} }
PrintAndLog("Card is selected. You can now start sending commands"); if (!disconnectAfter) {
} else { PrintAndLog("Card is selected. You can now start sending commands");
}
}
if (disconnectAfter) {
PrintAndLog("Field dropped."); PrintAndLog("Field dropped.");
} }
return 0; return 0;
} }
@ -1009,7 +1013,7 @@ static command_t CommandTable[] =
{"cuids", CmdHF14ACUIDs, 0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"}, {"cuids", CmdHF14ACUIDs, 0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
{"sim", CmdHF14ASim, 0, "<UID> -- Simulate ISO 14443a tag"}, {"sim", CmdHF14ASim, 0, "<UID> -- Simulate ISO 14443a tag"},
{"snoop", CmdHF14ASnoop, 0, "Eavesdrop ISO 14443 Type A"}, {"snoop", CmdHF14ASnoop, 0, "Eavesdrop ISO 14443 Type A"},
{"apdu", CmdHF14AAPDU, 0, "Send ISO 1443-4 APDU to tag"}, {"apdu", CmdHF14AAPDU, 0, "Send ISO 14443-4 APDU to tag"},
{"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"}, {"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };