github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 06:13:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chaining iso14443-4 works

Browse source
This commit is contained in:
merlokk 2018-10-17 20:47:53 +03:00
commit 508f4035e1
2 changed files with 33 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

125
client/cmdhf14a.c
View file

@ -747,7 +747,10 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
return 0; return 0;
} }
int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, 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;
*chaining = false;
if (activateField) { if (activateField) {
cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE; cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
@ -771,6 +774,7 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
} }
if (resp.arg[0] != 1) { if (resp.arg[0] != 1) {
PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]); PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
DropField();
return 1; return 1;
} }
} }
@ -795,6 +799,12 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
return 1; return 1;
} }
// check apdu length
if (iLen < 4 && iLen >= 0) {
PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
return 2;
}
// check block TODO // check block TODO
if (iLen == -2) { if (iLen == -2) {
PrintAndLog("APDU ERROR: Block type mismatch."); PrintAndLog("APDU ERROR: Block type mismatch.");
@ -803,11 +813,19 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
memcpy(dataout, recv, dlen); memcpy(dataout, recv, dlen);
// chaining
if ((res & 0x10) != 0) {
*chaining = true;
}
// CRC Check // CRC Check
if (iLen == -1) { if (iLen == -1) {
PrintAndLog("APDU ERROR: ISO 14443A CRC error."); PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
return 3; return 3;
} }
} else {
PrintAndLog("APDU ERROR: Reply timeout.");
return 4;
} }
return 0; return 0;
@ -815,110 +833,21 @@ int CmdExchangeAPDU(uint8_t *datain, int datainlen, bool activateField, uint8_t
int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) { int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen) {
uint16_t cmdc = 0;
int dlen;
*dataoutlen = 0; *dataoutlen = 0;
bool chaining = false;
int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen); int res = CmdExchangeAPDU(datain, datainlen, activateField, dataout, maxdataoutlen, dataoutlen, &chaining);
//start refactoring...
if (activateField) {
cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
}
if (leaveSignalON)
cmdc |= ISO14A_NO_DISCONNECT;
// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes while (chaining) {
// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
// here length USB_CMD_DATA_SIZE=512
// timeout must be authomatically set by "get ATS"
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
memcpy(c.d.asBytes, datain, datainlen);
SendCommand(&c);
uint8_t *recv;
UsbCommand resp;
if (activateField) {
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
PrintAndLog("APDU ERROR: Proxmark connection timeout.");
return 1;
}
if (resp.arg[0] != 1) {
PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
return 1;
}
}
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
recv = resp.d.asBytes;
int iLen = resp.arg[0];
uint8_t res = resp.arg[1];
dlen = iLen - 2;
if (dlen < 0)
dlen = 0;
*dataoutlen += dlen;
if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
return 2;
}
memcpy(dataout, recv, *dataoutlen);
if(!iLen) {
PrintAndLog("APDU ERROR: No APDU response.");
return 1;
}
// check block TODO
if (iLen == -2) {
PrintAndLog("APDU ERROR: Block type mismatch.");
return 2;
}
// CRC Check
if (iLen == -1) {
PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
return 3;
}
if ((res & 0x10) != 0) {
// I-block with chaining // I-block with chaining
int oldlen = *dataoutlen; res = CmdExchangeAPDU(NULL, 0, false, &dataout[*dataoutlen], maxdataoutlen, dataoutlen, &chaining);
printf("-->%02x oldlen:%d\n", res, oldlen);
UsbCommand c1 = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT, 0, 0}};
SendCommand(&c1);
uint8_t *recv1; if (res) {
UsbCommand resp1; if (!leaveSignalON)
if (WaitForResponseTimeout(CMD_ACK, &resp1, 1500)) { DropField();
dlen = resp1.arg[0] - 2;
if (dlen < 0)
dlen = 0;
*dataoutlen += dlen;
recv1 = resp1.d.asBytes; return 100;
printf("dlen:%d\n", dlen);
if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
PrintAndLog("APDU ERROR: Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
return 2;
} }
memcpy(&dataout[oldlen], recv1, dlen);
}
}
// check apdu length
if (iLen < 4) {
PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
return 2;
}
} else {
PrintAndLog("APDU ERROR: Reply timeout.");
return 4;
} }
if (!leaveSignalON) if (!leaveSignalON)

3
client/cmdhffido.c
View file

@ -117,6 +117,7 @@ int CmdHFFidoRegister(const char *cmd) {
uint8_t data[64] = {0}; uint8_t data[64] = {0};
SetAPDULogging(true); SetAPDULogging(true);
DropField();
uint8_t buf[2048] = {0}; uint8_t buf[2048] = {0};
size_t len = 0; size_t len = 0;
@ -146,6 +147,7 @@ int CmdHFFidoRegister(const char *cmd) {
PrintAndLog("---------------------------------------------------------------"); PrintAndLog("---------------------------------------------------------------");
PrintAndLog("data len: %d", len); PrintAndLog("data len: %d", len);
dump_buffer((const unsigned char *)buf, len, NULL, 0);
if (buf[0] != 0x05) { if (buf[0] != 0x05) {
PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]); PrintAndLog("ERROR: First byte must be 0x05, but it %2x", buf[0]);
@ -158,6 +160,7 @@ int CmdHFFidoRegister(const char *cmd) {
PrintAndLog("DER certificate[%d]: %s", keyHandleLen, sprint_hex(&buf[67 + keyHandleLen], 20)); PrintAndLog("DER certificate[%d]: %s", keyHandleLen, sprint_hex(&buf[67 + keyHandleLen], 20));
DropField();
return 0; return 0;
}; };