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

info and some fix in exchange

Browse source
This commit is contained in:
merlokk 2018-10-24 19:19:15 +03:00
commit 122cbe7d1d
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/cmdhf14a.c
View file

@ -669,10 +669,12 @@ int CmdHF14ASniff(const char *Cmd) {
} }
int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
static bool responseNum = false;
uint16_t cmdc = 0; uint16_t cmdc = 0;
*dataoutlen = 0; *dataoutlen = 0;
if (activateField) { if (activateField) {
responseNum = false;
UsbCommand resp; UsbCommand resp;
// Anticollision + SELECT card // Anticollision + SELECT card
@ -685,7 +687,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
// check result // check result
if (resp.arg[0] == 0) { if (resp.arg[0] == 0) {
PrintAndLogEx(NORMAL, "No card in field."); PrintAndLogEx(ERR, "No card in field.");
return 1; return 1;
} }
@ -715,8 +717,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
if (leaveSignalON) if (leaveSignalON)
cmdc |= ISO14A_NO_DISCONNECT; cmdc |= ISO14A_NO_DISCONNECT;
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF), 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_APPEND_CRC | cmdc, (datainlen & 0xFFFF) + 2, 0}};
memcpy(c.d.asBytes, datain, datainlen); uint8_t header[] = {0x0a | responseNum, 0x00};
responseNum ^= 1;
memcpy(c.d.asBytes, header, 2);
memcpy(&c.d.asBytes[2], datain, datainlen);
SendCommand(&c); SendCommand(&c);
uint8_t *recv; uint8_t *recv;
@ -726,6 +731,11 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
recv = resp.d.asBytes; recv = resp.d.asBytes;
int iLen = resp.arg[0]; int iLen = resp.arg[0];
if(!iLen) {
PrintAndLogEx(ERR, "No card response.");
return 1;
}
*dataoutlen = iLen - 2; *dataoutlen = iLen - 2;
if (*dataoutlen < 0) if (*dataoutlen < 0)
*dataoutlen = 0; *dataoutlen = 0;
@ -735,13 +745,13 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
return 2; return 2;
} }
memcpy(dataout, recv, *dataoutlen); if (recv[0] != header[0]) {
PrintAndLogEx(ERR, "iso14443-4 framing error. Card send %2x must be %2x", dataout[0], header[0]);
if(!iLen) { return 2;
PrintAndLogEx(ERR, "No card response.");
return 1;
} }
memcpy(dataout, &recv[2], *dataoutlen);
// CRC Check // CRC Check
if (iLen == -1) { if (iLen == -1) {
PrintAndLogEx(ERR, "ISO 14443A CRC error."); PrintAndLogEx(ERR, "ISO 14443A CRC error.");