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

exchange apdu14a works with chaining

Browse source
This commit is contained in:
merlokk 2018-11-12 16:17:31 +02:00
commit 7820be1b8a
1 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

77
client/cmdhf14a.c
View file

@ -767,20 +767,20 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
return 0; return 0;
} }
int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, bool *chaining) {
uint16_t cmdc = 0; uint16_t cmdc = 0;
*chaining = false;
if (activateField) { if (activateField) {
cmdc |= ISO14A_CONNECT; cmdc |= ISO14A_CONNECT;
} }
if (leaveSignalON)
cmdc |= ISO14A_NO_DISCONNECT;
// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes // "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size // https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
// here length USB_CMD_DATA_SIZE=512 // here length USB_CMD_DATA_SIZE=512
// timeout must be authomatically set by "get ATS" // timeout must be authomatically set by "get ATS"
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | cmdc, (datainlen & 0xFFFF), 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
memcpy(c.d.asBytes, datain, datainlen); memcpy(c.d.asBytes, datain, datainlen);
SendCommand(&c); SendCommand(&c);
@ -789,11 +789,12 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
if (activateField) { if (activateField) {
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
PrintAndLogEx(NORMAL, "APDU ERROR: Proxmark connection timeout."); PrintAndLogEx(ERR, "APDU: Proxmark connection timeout.");
return 1; return 1;
} }
if (resp.arg[0] != 1) { if (resp.arg[0] != 1) {
PrintAndLogEx(NORMAL, "APDU ERROR: Proxmark error %d.", resp.arg[0]); PrintAndLogEx(ERR, "APDU: Proxmark error %d.", resp.arg[0]);
DropField();
return 1; return 1;
} }
} }
@ -801,45 +802,75 @@ int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool lea
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
recv = resp.d.asBytes; recv = resp.d.asBytes;
int iLen = resp.arg[0]; int iLen = resp.arg[0];
uint8_t res = resp.arg[1];
*dataoutlen = iLen - 2; int dlen = iLen - 2;
if (*dataoutlen < 0) if (dlen < 0)
*dataoutlen = 0; dlen = 0;
*dataoutlen += dlen;
if (maxdataoutlen && *dataoutlen > maxdataoutlen) { if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
PrintAndLogEx(NORMAL, "APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen); PrintAndLogEx(ERR, "APDU: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
return 2; return 2;
} }
memcpy(dataout, recv, *dataoutlen);
if(!iLen) { if(!iLen) {
PrintAndLogEx(NORMAL, "APDU ERROR: No APDU response."); PrintAndLogEx(ERR, "APDU: No APDU response.");
return 1; return 1;
} }
// check apdu length
if (iLen < 4 && iLen >= 0) {
PrintAndLogEx(ERR, "APDU: Small APDU response. Len=%d", iLen);
return 2;
}
// check block TODO // check block TODO
if (iLen == -2) { if (iLen == -2) {
PrintAndLogEx(NORMAL, "APDU ERROR: Block type mismatch."); PrintAndLogEx(ERR, "APDU: Block type mismatch.");
return 2; return 2;
} }
memcpy(dataout, recv, dlen);
// chaining
if ((res & 0x10) != 0) {
*chaining = true;
}
// CRC Check // CRC Check
if (iLen == -1) { if (iLen == -1) {
PrintAndLogEx(NORMAL, "APDU ERROR: ISO 14443A CRC error."); PrintAndLogEx(ERR, "APDU: ISO 14443A CRC error.");
return 3; return 3;
} }
// check apdu length
if (iLen < 4) {
PrintAndLogEx(NORMAL, "APDU ERROR: Small APDU response. Len=%d", iLen);
return 2;
}
} else { } else {
PrintAndLogEx(NORMAL, "APDU ERROR: Reply timeout."); PrintAndLogEx(ERR, "APDU: Reply timeout.");
return 4; return 4;
} }
return 0;
}
int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
*dataoutlen = 0;
bool chaining = false;
int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
while (chaining) {
// I-block with chaining
res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
if (res) {
if (!leaveSignalON)
DropField();
return 100;
}
}
if (!leaveSignalON)
DropField();
return 0; return 0;
} }