#include "cliparser/cliparser.h"
#include "emv/apduinfo.h"
#include "emv/emvcore.h"
+#include "taginfo.h"
static int CmdHelp(const char *Cmd);
static int waitCmd(uint8_t iLen);
-// structure and database for uid -> tagtype lookups
-typedef struct {
- uint8_t uid;
- char* desc;
-} manufactureName;
-
-static const manufactureName manufactureMapping[] = {
- // ID, "Vendor Country"
- { 0x01, "Motorola UK" },
- { 0x02, "ST Microelectronics SA France" },
- { 0x03, "Hitachi, Ltd Japan" },
- { 0x04, "NXP Semiconductors Germany" },
- { 0x05, "Infineon Technologies AG Germany" },
- { 0x06, "Cylink USA" },
- { 0x07, "Texas Instrument France" },
- { 0x08, "Fujitsu Limited Japan" },
- { 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
- { 0x0A, "NEC Japan" },
- { 0x0B, "Oki Electric Industry Co. Ltd Japan" },
- { 0x0C, "Toshiba Corp. Japan" },
- { 0x0D, "Mitsubishi Electric Corp. Japan" },
- { 0x0E, "Samsung Electronics Co. Ltd Korea" },
- { 0x0F, "Hynix / Hyundai, Korea" },
- { 0x10, "LG-Semiconductors Co. Ltd Korea" },
- { 0x11, "Emosyn-EM Microelectronics USA" },
- { 0x12, "INSIDE Technology France" },
- { 0x13, "ORGA Kartensysteme GmbH Germany" },
- { 0x14, "SHARP Corporation Japan" },
- { 0x15, "ATMEL France" },
- { 0x16, "EM Microelectronic-Marin SA Switzerland" },
- { 0x17, "KSW Microtec GmbH Germany" },
- { 0x18, "ZMD AG Germany" },
- { 0x19, "XICOR, Inc. USA" },
- { 0x1A, "Sony Corporation Japan Identifier Company Country" },
- { 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
- { 0x1C, "Emosyn USA" },
- { 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
- { 0x1E, "Magellan Technology Pty Limited Australia" },
- { 0x1F, "Melexis NV BO Switzerland" },
- { 0x20, "Renesas Technology Corp. Japan" },
- { 0x21, "TAGSYS France" },
- { 0x22, "Transcore USA" },
- { 0x23, "Shanghai belling corp., ltd. China" },
- { 0x24, "Masktech Germany Gmbh Germany" },
- { 0x25, "Innovision Research and Technology Plc UK" },
- { 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },
- { 0x27, "Cypak AB Sweden" },
- { 0x28, "Ricoh Japan" },
- { 0x29, "ASK France" },
- { 0x2A, "Unicore Microsystems, LLC Russian Federation" },
- { 0x2B, "Dallas Semiconductor/Maxim USA" },
- { 0x2C, "Impinj, Inc. USA" },
- { 0x2D, "RightPlug Alliance USA" },
- { 0x2E, "Broadcom Corporation USA" },
- { 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },
- { 0x30, "BeeDar Technology Inc. USA" },
- { 0x31, "RFIDsec Denmark" },
- { 0x32, "Schweizer Electronic AG Germany" },
- { 0x33, "AMIC Technology Corp Taiwan" },
- { 0x34, "Mikron JSC Russia" },
- { 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
- { 0x36, "IDS Microchip AG Switzerland" },
- { 0x37, "Kovio USA" },
- { 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
- { 0x39, "Silicon Craft Technology Thailand" },
- { 0x3A, "Advanced Film Device Inc. Japan" },
- { 0x3B, "Nitecrest Ltd UK" },
- { 0x3C, "Verayo Inc. USA" },
- { 0x3D, "HID Global USA" },
- { 0x3E, "Productivity Engineering Gmbh Germany" },
- { 0x3F, "Austriamicrosystems AG (reserved) Austria" },
- { 0x40, "Gemalto SA France" },
- { 0x41, "Renesas Electronics Corporation Japan" },
- { 0x42, "3Alogics Inc Korea" },
- { 0x43, "Top TroniQ Asia Limited Hong Kong" },
- { 0x44, "Gentag Inc (USA) USA" },
- { 0x00, "no tag-info available" } // must be the last entry
-};
-
-// get a product description based on the UID
-// uid[8] tag uid
-// returns description of the best match
-char* getTagInfo(uint8_t uid) {
-
- int i;
- int len = sizeof(manufactureMapping) / sizeof(manufactureName);
-
- for ( i = 0; i < len; ++i )
- if ( uid == manufactureMapping[i].uid)
- return manufactureMapping[i].desc;
-
- //No match, return default
- return manufactureMapping[len-1].desc;
-}
-
int CmdHF14AList(const char *Cmd)
{
PrintAndLog("Deprecated command, use 'hf list 14a' instead");
// Double & triple sized UID, can be mapped to a manufacturer.
// HACK: does this apply for Ultralight cards?
if ( card.uidlen > 4 ) {
- PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+ PrintAndLog("MANUFACTURER : %s", getManufacturerName(card.uid[0]));
}
// try to request ATS even if tag claims not to support it
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;
+
+ *chaining = false;
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
// 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 | 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);
SendCommand(&c);
}
if (resp.arg[0] != 1) {
PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
+ DropField();
return 1;
}
}
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
recv = resp.d.asBytes;
int iLen = resp.arg[0];
+ uint8_t res = resp.arg[1];
- *dataoutlen = iLen - 2;
- if (*dataoutlen < 0)
- *dataoutlen = 0;
+ int 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 apdu length
+ if (iLen < 4 && iLen >= 0) {
+ PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
+ return 2;
+ }
+
// check block TODO
if (iLen == -2) {
PrintAndLog("APDU ERROR: Block type mismatch.");
return 2;
}
+
+ memcpy(dataout, recv, dlen);
+
+ // chaining
+ if ((res & 0x10) != 0) {
+ *chaining = true;
+ }
// CRC Check
if (iLen == -1) {
PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
return 3;
}
-
- // 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;
}
+
+ 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;
}
projects / proxmark3-svn / blobdiff