From: pwpiwi Date: Sun, 3 Mar 2019 10:59:38 +0000 (+0100) Subject: chip manufacturer and type identification: (#796) X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1338d245c2ff5930a059d3d1fdea93a535fe6e61 chip manufacturer and type identification: (#796) * add more manufacturers * refactor chipID decoding * move to separate file taginfo.[ch] --- diff --git a/client/Makefile b/client/Makefile index aafbe375..5fc1d226 100644 --- a/client/Makefile +++ b/client/Makefile @@ -218,7 +218,8 @@ CMDSRCS = $(SRC_SMARTCARD) \ cmdscript.c\ pm3_binlib.c\ pm3_bitlib.c\ - protocols.c + protocols.c\ + taginfo.c cpu_arch = $(shell uname -m) ifneq ($(findstring 86, $(cpu_arch)), ) diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 922a9449..2bf84d22 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -31,105 +31,11 @@ #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"); @@ -363,7 +269,7 @@ int CmdHF14AInfo(const char *Cmd) // 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 diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h index d961d570..c4294b4c 100644 --- a/client/cmdhf14a.h +++ b/client/cmdhf14a.h @@ -23,7 +23,6 @@ int CmdHF14AReader(const char *Cmd); extern int CmdHF14AInfo(const char *Cmd); int CmdHF14ASim(const char *Cmd); int CmdHF14ASnoop(const char *Cmd); -char* getTagInfo(uint8_t uid); extern void DropField(); diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index ff0bf7c9..7cd55476 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -22,7 +22,8 @@ #include "ui.h" #include "cmdparser.h" #include "cmdmain.h" -#include "cmdhf14a.h" +#include "taginfo.h" + static int CmdHelp(const char *Cmd); @@ -305,24 +306,6 @@ static void print_atqb_resp(uint8_t *data){ return; } -// get SRx chip model (from UID) // from ST Microelectronics -char *get_ST_Chip_Model(uint8_t data){ - static char model[20]; - char *retStr = model; - memset(model,0, sizeof(model)); - - switch (data) { - case 0x0: sprintf(retStr, "SRIX4K (Special)"); break; - case 0x2: sprintf(retStr, "SR176"); break; - case 0x3: sprintf(retStr, "SRIX4K"); break; - case 0x4: sprintf(retStr, "SRIX512"); break; - case 0x6: sprintf(retStr, "SRI512"); break; - case 0x7: sprintf(retStr, "SRI4K"); break; - case 0xC: sprintf(retStr, "SRT512"); break; - default : sprintf(retStr, "Unknown"); break; - } - return retStr; -} int print_ST_Lock_info(uint8_t model){ //assume connection open and tag selected... @@ -393,8 +376,8 @@ int print_ST_Lock_info(uint8_t model){ static void print_st_general_info(uint8_t *data){ //uid = first 8 bytes in data PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8)); - PrintAndLog(" MFG: %02X, %s", data[6], getTagInfo(data[6])); - PrintAndLog(" Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2)); + PrintAndLog(" MFG: %02X, %s", data[6], getManufacturerName(data[6])); + PrintAndLog(" Chip: %02X, %s", data[5], getChipInfo(data[6], data[5])); return; } diff --git a/client/cmdhf15.c b/client/cmdhf15.c index da83ccaf..5a7973f6 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -37,6 +37,7 @@ #include "iso15693tools.h" #include "protocols.h" #include "cmdmain.h" +#include "taginfo.h" #define Crc(data,datalen) Iso15693Crc(data,datalen) #define AddCrc(data,datalen) Iso15693AddCrc(data,datalen) @@ -86,158 +87,6 @@ static const int Iso15693FrameEOF[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; -// structure and database for uid -> tagtype lookups -typedef struct { - uint64_t uid; - int mask; // how many MSB bits used - char* desc; -} productName; - - -const productName uidmapping[] = { - - // UID, #significant Bits, "Vendor(+Product)" - { 0xE001000000000000LL, 16, "Motorola UK" }, - - // E0 02 xx - // 02 = ST Microelectronics - // XX = IC id (Chip ID Family) - { 0xE002000000000000LL, 16, "ST Microelectronics SA France" }, - { 0xE002050000000000LL, 24, "ST Microelectronics; LRI64 [IC id = 05]"}, - { 0xE002080000000000LL, 24, "ST Microelectronics; LRI2K [IC id = 08]"}, - { 0xE0020A0000000000LL, 24, "ST Microelectronics; LRIS2K [IC id = 10]"}, - { 0xE002440000000000LL, 24, "ST Microelectronics; LRIS64K [IC id = 68]"}, - - { 0xE003000000000000LL, 16, "Hitachi, Ltd Japan" }, - - // E0 04 xx - // 04 = Manufacturer code (Philips/NXP) - // XX = IC id (Chip ID Family) - //I-Code SLI SL2 ICS20 [IC id = 01] - //I-Code SLI-S [IC id = 02] - //I-Code SLI-L [IC id = 03] - //I-Code SLIX [IC id = 01 + bit36 set to 1 (starting from bit0 - different from normal SLI)] - //I-Code SLIX-S [IC id = 02 + bit36 set to 1] - //I-Code SLIX-L [IC id = 03 + bit36 set to 1] - { 0xE004000000000000LL, 16, "NXP Semiconductors Germany (Philips)" }, - { 0xE004010000000000LL, 24, "NXP(Philips); IC SL2 ICS20/ICS21(SLI) ICS2002/ICS2102(SLIX)" }, - { 0xE004020000000000LL, 24, "NXP(Philips); IC SL2 ICS53/ICS54(SLI-S) ICS5302/ICS5402(SLIX-S)" }, - { 0xE004030000000000LL, 24, "NXP(Philips); IC SL2 ICS50/ICS51(SLI-L) ICS5002/ICS5102(SLIX-L)" }, - - // E0 05 XX .. .. .. - // 05 = Manufacturer code (Infineon) - // XX = IC id (Chip ID Family) - { 0xE005000000000000LL, 16, "Infineon Technologies AG Germany" }, - { 0xE005A10000000000LL, 24, "Infineon; SRF55V01P [IC id = 161] plain mode 1kBit"}, - { 0xE005A80000000000LL, 24, "Infineon; SRF55V01P [IC id = 168] pilot series 1kBit"}, - { 0xE005400000000000LL, 24, "Infineon; SRF55V02P [IC id = 64] plain mode 2kBit"}, - { 0xE005000000000000LL, 24, "Infineon; SRF55V10P [IC id = 00] plain mode 10KBit"}, - { 0xE005500000000000LL, 24, "Infineon; SRF55V02S [IC id = 80] secure mode 2kBit"}, - { 0xE005100000000000LL, 24, "Infineon; SRF55V10S [IC id = 16] secure mode 10KBit"}, - { 0xE0051E0000000000LL, 23, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"}, - { 0xE005200000000000LL, 21, "Infineon; SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"}, - - { 0xE006000000000000LL, 16, "Cylink USA" }, - - - // E0 07 xx - // 07 = Texas Instruments - // XX = from bit 41 to bit 43 = product configuration - from bit 44 to bit 47 IC id (Chip ID Family) - //Tag IT RFIDType-I Plus, 2kBit, TI Inlay - //Tag-it HF-I Plus Inlay [IC id = 00] -> b'0000 000 2kBit - //Tag-it HF-I Plus Chip [IC id = 64] -> b'1000 000 2kBit - //Tag-it HF-I Standard Chip / Inlays [IC id = 96] -> b'1100 000 256Bit - //Tag-it HF-I Pro Chip / Inlays [IC id = 98] -> b'1100 010 256Bit, Password protection - { 0xE007000000000000LL, 16, "Texas Instrument France" }, - { 0xE007000000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Inlay; 64x32bit" }, - { 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" }, - { 0xE007800000000000LL, 23, "Texas Instrument; Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" }, - { 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" }, - { 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" }, - - { 0xE008000000000000LL, 16, "Fujitsu Limited Japan" }, - { 0xE009000000000000LL, 16, "Matsushita Electronics Corporation, Semiconductor Company Japan" }, - { 0xE00A000000000000LL, 16, "NEC Japan" }, - { 0xE00B000000000000LL, 16, "Oki Electric Industry Co. Ltd Japan" }, - { 0xE00C000000000000LL, 16, "Toshiba Corp. Japan" }, - { 0xE00D000000000000LL, 16, "Mitsubishi Electric Corp. Japan" }, - { 0xE00E000000000000LL, 16, "Samsung Electronics Co. Ltd Korea" }, - { 0xE00F000000000000LL, 16, "Hynix / Hyundai, Korea" }, - { 0xE010000000000000LL, 16, "LG-Semiconductors Co. Ltd Korea" }, - { 0xE011000000000000LL, 16, "Emosyn-EM Microelectronics USA" }, - - { 0xE012000000000000LL, 16, "HID Corporation" }, - { 0xE012000000000000LL, 16, "INSIDE Technology France" }, - { 0xE013000000000000LL, 16, "ORGA Kartensysteme GmbH Germany" }, - { 0xE014000000000000LL, 16, "SHARP Corporation Japan" }, - { 0xE015000000000000LL, 16, "ATMEL France" }, - - { 0xE016000000000000LL, 16, "EM Microelectronic-Marin SA Switzerland (Skidata)"}, - { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); EM4034 [IC id = 01] (Read/Write - no AFI)"}, - { 0xE0160C0000000000LL, 24, "EM-Marin SA (Skidata); EM4035 [IC id = 03] (Read/Write - replaced by 4233)"}, - { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"}, - { 0xE016140000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 05] 28pF"}, - { 0xE016180000000000LL, 24, "EM-Marin SA (Skidata); EM4006 [IC id = 06] (Read Only)"}, - { 0xE0161C0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 07] 23,5pF (Read/Write)"}, - { 0xE016200000000000LL, 24, "EM-Marin SA (Skidata); EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"}, - { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 09] 23,5pF CustomerID-102"}, - { 0xE016280000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" }, - { 0xE0163C0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 15] 23,5pF"}, - { 0xE0167C0000000000LL, 24, "EM-Marin SA (Skidata); EM4233 [IC id = 31] 95pF"}, - { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); EM4036 [IC id = 37] 95pF 51x64bit "}, - { 0xE0169c0000000000LL, 24, "EM-Marin SA (Skidata); EM4133 [IC id = 39] 95pF (Read/Write)" }, - { 0xE016A80000000000LL, 24, "EM-Marin SA (Skidata); EM4233 SLIC [IC id = 42] 97pF" }, - { 0xE016BC0000000000LL, 24, "EM-Marin SA (Skidata); EM4237 [IC id = 47] 97pF" }, - - { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" }, - { 0xE018000000000000LL, 16, "ZMD AG Germany" }, - { 0xE019000000000000LL, 16, "XICOR, Inc. USA" }, - { 0xE01A000000000000LL, 16, "Sony Corporation Japan Identifier Company Country" }, - { 0xE01B000000000000LL, 16, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" }, - { 0xE01C000000000000LL, 16, "Emosyn USA" }, - { 0xE01D000000000000LL, 16, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" }, - { 0xE01E000000000000LL, 16, "Magellan Technology Pty Limited Australia" }, - { 0xE01F000000000000LL, 16, "Melexis NV BO Switzerland" }, - { 0xE020000000000000LL, 16, "Renesas Technology Corp. Japan" }, - { 0xE021000000000000LL, 16, "TAGSYS France" }, - { 0xE022000000000000LL, 16, "Transcore USA" }, - { 0xE023000000000000LL, 16, "Shanghai belling corp., ltd. China" }, - { 0xE024000000000000LL, 16, "Masktech Germany Gmbh Germany" }, - { 0xE025000000000000LL, 16, "Innovision Research and Technology Plc UK" }, - { 0xE026000000000000LL, 16, "Hitachi ULSI Systems Co., Ltd. Japan" }, - { 0xE027000000000000LL, 16, "Cypak AB Sweden" }, - { 0xE028000000000000LL, 16, "Ricoh Japan" }, - { 0xE029000000000000LL, 16, "ASK France" }, - { 0xE02A000000000000LL, 16, "Unicore Microsystems, LLC Russian Federation" }, - { 0xE02B000000000000LL, 16, "Dallas Semiconductor/Maxim USA" }, - { 0xE02C000000000000LL, 16, "Impinj, Inc. USA" }, - { 0xE02D000000000000LL, 16, "RightPlug Alliance USA" }, - { 0xE02E000000000000LL, 16, "Broadcom Corporation USA" }, - { 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" }, - { 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" }, - { 0xE031000000000000LL, 16, " RFIDsec Denmark" }, - { 0xE032000000000000LL, 16, " Schweizer Electronic AG Germany" }, - { 0xE033000000000000LL, 16, " AMIC Technology Corp Taiwan" }, - { 0xE034000000000000LL, 16, "Mikron JSC Russia" }, - { 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" }, - { 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" }, - { 0xE037000000000000LL, 16, "Kovio USA" }, - { 0xE038000000000000LL, 16, "HMT Microelectronic Ltd Switzerland Identifier Company Country" }, - { 0xE039000000000000LL, 16, "Silicon Craft Technology Thailand" }, - { 0xE03A000000000000LL, 16, "Advanced Film Device Inc. Japan" }, - { 0xE03B000000000000LL, 16, "Nitecrest Ltd UK" }, - { 0xE03C000000000000LL, 16, "Verayo Inc. USA" }, - { 0xE03D000000000000LL, 16, "HID Global USA" }, - { 0xE03E000000000000LL, 16, "Productivity Engineering Gmbh Germany" }, - { 0xE03F000000000000LL, 16, "Austriamicrosystems AG (reserved) Austria" }, - { 0xE040000000000000LL, 16, "Gemalto SA France" }, - { 0xE041000000000000LL, 16, "Renesas Electronics Corporation Japan" }, - { 0xE042000000000000LL, 16, "3Alogics Inc Korea" }, - { 0xE043000000000000LL, 16, "Top TroniQ Asia Limited Hong Kong" }, - { 0xE044000000000000LL, 16, "Gentag Inc (USA) USA" }, - { 0,0,"no tag-info available" } // must be the last entry -}; - // fast method to just read the UID of a tag (collission detection not supported) // *buf should be large enough to fit the 64bit uid @@ -272,34 +121,6 @@ int getUID(uint8_t *buf) } - -// get a product description based on the UID -// uid[8] tag uid -// returns description of the best match -static char* getTagInfo(uint8_t *uid) { - uint64_t myuid,mask; - int i=0, best=-1; - memcpy(&myuid,uid,sizeof(uint64_t)); - while (uidmapping[i].mask>0) { - mask=(~0LL) <<(64-uidmapping[i].mask); - if ((myuid & mask) == uidmapping[i].uid) { - if (best==-1) { - best=i; - } else { - if (uidmapping[i].mask>uidmapping[best].mask) { - best=i; - } - } - } - i++; - } - - if (best>=0) return uidmapping[best].desc; - - return uidmapping[i].desc; -} - - // return a clear-text message to an errorcode static char* TagErrorStr(uint8_t error) { switch (error) { @@ -429,8 +250,9 @@ int HF15Reader(const char *Cmd, bool verbose) return 0; } - PrintAndLog("Tag UID : %s",sprintUID(NULL,uid)); - PrintAndLog("Tag Info: %s",getTagInfo(uid)); + PrintAndLog("UID: %s", sprintUID(NULL,uid)); + PrintAndLog("Manufacturer byte: %02X, %s", uid[6], getManufacturerName(uid[6])); + PrintAndLog("Chip ID: %02X, %s", uid[5], getChipInfo(uid[6], uid[5])); return 1; } @@ -496,8 +318,10 @@ int CmdHF15DumpMem(const char*Cmd) { return 0; } - PrintAndLog("Reading memory from tag UID=%s",sprintUID(NULL,uid)); - PrintAndLog("Tag Info: %s",getTagInfo(uid)); + PrintAndLog("Reading memory from tag"); + PrintAndLog("UID: %s", sprintUID(NULL,uid)); + PrintAndLog("Manufacturer byte: %02X, %s", uid[6], getManufacturerName(uid[6])); + PrintAndLog("Chip ID: %02X, %s", uid[5], getChipInfo(uid[6], uid[5])); for (int retry=0; retry<5; retry++) { @@ -595,9 +419,10 @@ int CmdHF15CmdInquiry(const char *Cmd) if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) { if (resp.arg[0]>=12) { - recv = resp.d.asBytes; - PrintAndLog("UID=%s",sprintUID(NULL,&recv[2])); - PrintAndLog("Tag Info: %s",getTagInfo(&recv[2])); + recv = resp.d.asBytes; + PrintAndLog("UID: %s", sprintUID(NULL,recv+2)); + PrintAndLog("Manufacturer byte: %02X, %s", recv[8], getManufacturerName(recv[8])); + PrintAndLog("Chip ID: %02X, %s", recv[7], getChipInfo(recv[8], recv[7])); } else { PrintAndLog("Response to short, just %i bytes. No tag?\n",resp.arg[0]); } @@ -855,15 +680,9 @@ int CmdHF15CmdSysinfo(const char *Cmd) { if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) { if (!(recv[0] & ISO15693_RES_ERROR)) { *output=0; // reset outputstring - for ( i=1; i> 4) == 2 ) { // is infineon and 66RxxP uint8_t chip = (data[8] & 0xC7); // 11000111 mask, bit 3,4,5 RFU switch (chip){ @@ -516,7 +516,7 @@ static int ulev1_print_signature( uint8_t *data, uint8_t len){ static int ulev1_print_version(uint8_t *data){ PrintAndLog("\n--- Tag Version"); PrintAndLog(" Raw bytes : %s",sprint_hex(data, 8) ); - PrintAndLog(" Vendor ID : %02X, %s", data[1], getTagInfo(data[1])); + PrintAndLog(" Vendor ID : %02X, %s", data[1], getManufacturerName(data[1])); PrintAndLog(" Product type : %s", getProductTypeStr(data[2])); PrintAndLog(" Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF"); PrintAndLog(" Major version : %02X", data[4]); diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c index 6058cabe..261d78aa 100644 --- a/client/cmdhftopaz.c +++ b/client/cmdhftopaz.c @@ -22,6 +22,7 @@ #include "comms.h" #include "iso14443crc.h" #include "protocols.h" +#include "taginfo.h" #define TOPAZ_STATIC_MEMORY (0x0f * 8) // 15 blocks with 8 Bytes each @@ -477,7 +478,7 @@ int CmdHFTopazReader(const char *Cmd) topaz_tag.uid[0]); PrintAndLog(" UID[6] (Manufacturer Byte) = %02x, Manufacturer: %s", topaz_tag.uid[6], - getTagInfo(topaz_tag.uid[6])); + getManufacturerName(topaz_tag.uid[6])); memcpy(topaz_tag.data_blocks, rall_response+2, 0x0f*8); PrintAndLog(""); diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 2a096cd0..b286c392 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -23,8 +23,8 @@ #include "cmdlf.h" #include "util.h" #include "lfdemod.h" -#include "cmdhf14a.h" //for getTagInfo #include "protocols.h" +#include "taginfo.h" #define T55x7_CONFIGURATION_BLOCK 0x00 #define T55x7_PAGE0 0x00 @@ -1070,7 +1070,7 @@ void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat ){ PrintAndLog("-- T55x7 Trace Information ----------------------------------"); PrintAndLog("-------------------------------------------------------------"); PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", data.acl, data.acl); - PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", data.mfc, data.mfc, getTagInfo(data.mfc)); + PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", data.mfc, data.mfc, getManufacturerName(data.mfc)); PrintAndLog(" CID : 0x%02X (%d) - %s", data.cid, data.cid, GetModelStrFromCID(data.cid)); PrintAndLog(" ICR IC Revision : %d", data.icr ); PrintAndLog(" Manufactured"); diff --git a/client/taginfo.c b/client/taginfo.c new file mode 100644 index 00000000..0949e43f --- /dev/null +++ b/client/taginfo.c @@ -0,0 +1,251 @@ +//----------------------------------------------------------------------------- +// Functions for Chip Identification +//----------------------------------------------------------------------------- + +#include "taginfo.h" + +#include + +// ISO/IEC 7816-6 manufacturer byte decoding + +typedef struct { + uint8_t manufacturer_byte; + char* desc; +} manufacturerName_t; + +// based on ISO/IEC JTC1/SC17 STANDING DOCUMENT 5 (Updated March 2018) Register of IC manufacturers +static const manufacturerName_t manufacturerMapping[] = { + // ID, "Vendor Country" + { 0x01, "Motorola UK"}, + { 0x02, "STMicroelectronics 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 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, "SMARTRAC TECHNOLOGY GmbH Germany"}, + { 0x18, "ZMD AG Germany"}, + { 0x19, "XICOR, Inc. USA"}, + { 0x1A, "Sony Corporation Japan"}, + { 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, "Yubico 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"}, + { 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"}, + { 0x45, "Invengo Information Technology Co.Ltd China"}, + { 0x46, "Guangzhou Sysur Microelectronics, Inc China"}, + { 0x47, "CEITEC S.A. Brazil"}, + { 0x48, "Shanghai Quanray Electronics Co. Ltd. China"}, + { 0x49, "MediaTek Inc Taiwan"}, + { 0x4A, "Angstrem PJSC Russia"}, + { 0x4B, "Celisic Semiconductor (Hong Kong) Limited China"}, + { 0x4C, "LEGIC Identsystems AG Switzerland"}, + { 0x4D, "Balluff GmbH Germany"}, + { 0x4E, "Oberthur Technologies France"}, + { 0x4F, "Silterra Malaysia Sdn. Bhd. Malaysia"}, + { 0x50, "DELTA Danish Electronics, Light & Acoustics Denmark"}, + { 0x51, "Giesecke & Devrient GmbH Germany"}, + { 0x52, "Shenzhen China Vision Microelectronics Co., Ltd. China"}, + { 0x53, "Shanghai Feiju Microelectronics Co. Ltd. China"}, + { 0x54, "Intel Corporation USA"}, + { 0x55, "Microsensys GmbH Germany"}, + { 0x56, "Sonix Technology Co., Ltd. Taiwan"}, + { 0x57, "Qualcomm Technologies Inc USA"}, + { 0x58, "Realtek Semiconductor Corp Taiwan"}, + { 0x59, "Freevision Technologies Co. Ltd China"}, + { 0x5A, "Giantec Semiconductor Inc. China"}, + { 0x5B, "JSC Angstrem-T Russia"}, + { 0x5C, "STARCHIP France"}, + { 0x5D, "SPIRTECH France"}, + { 0x5E, "GANTNER Electronic GmbH Austria"}, + { 0x5F, "Nordic Semiconductor Norway"}, + { 0x60, "Verisiti Inc USA"}, + { 0x61, "Wearlinks Technology Inc. China"}, + { 0x62, "Userstar Information Systems Co., Ltd Taiwan"}, + { 0x63, "Pragmatic Printing Ltd. UK"}, + { 0x64, "Associacao do Laboratorio de Sistemas Integraveis Tecnologico – LSI-TEC Brazil"}, + { 0x65, "Tendyron Corporation China"}, + { 0x66, "MUTO Smart Co., Ltd. Korea"}, + { 0x67, "ON Semiconductor USA"}, + { 0x68, "TÜBİTAK BİLGEM Turkey"}, + { 0x69, "Huada Semiconductor Co., Ltd China"}, + { 0x6A, "SEVENEY France"}, + { 0x6B, "ISSM France"}, + { 0x6C, "Wisesec Ltd Israel"}, + { 0x7E, "Holtek Taiwan"}, + { 0x00, "Unknown" } // must be the last entry +}; + +// get manufacturer's name and country based on the manufacturer byte +char *getManufacturerName(uint8_t vendorID) +{ + int i; + int len = sizeof(manufacturerMapping) / sizeof(manufacturerName_t); + + for (i = 0; i < len; ++i) + if (vendorID == manufacturerMapping[i].manufacturer_byte) + return manufacturerMapping[i].desc; + + //No match, return default + return manufacturerMapping[len-1].desc; +} + + +// Chip ID encoding + +typedef struct { + uint8_t manufacturer; // chip info is manufacturer specific + uint8_t chipID; + uint8_t mask; // relevant bits + char* desc; +} chipinfo_t; + + +const chipinfo_t chipIDmapping[] = { + // manufacturer_byte, chip_id, bitmask for chip_id, Text + + // 0x02 = ST Microelectronics + { 0x02, 0x05, 0xFF, "LRI64 [IC id = 05]"}, + { 0x02, 0x08, 0xFF, "LRI2K [IC id = 08]"}, + { 0x02, 0x0A, 0xFF, "LRIS2K [IC id = 10]"}, + { 0x02, 0x44, 0xFF, "LRIS64K [IC id = 68]"}, + { 0x02, 0x00, 0xFC, "SRIX4K (Special)"}, + { 0x02, 0x08, 0xFC, "SR176"}, + { 0x02, 0x0C, 0xFC, "SRIX4K"}, + { 0x02, 0x10, 0xFC, "SRIX512"}, + { 0x02, 0x18, 0xFC, "SRI512"}, + { 0x02, 0x1C, 0xFC, "SRI4K"}, + { 0x02, 0x30, 0xFC, "SRT512"}, + + // 0x04 = Philips/NXP + //I-Code SLI SL2 ICS20 [IC id = 01] + //I-Code SLI-S [IC id = 02] + //I-Code SLI-L [IC id = 03] + //I-Code SLIX [IC id = 01 + bit36 set to 1 (starting from bit0 - different from normal SLI)] + //I-Code SLIX-S [IC id = 02 + bit36 set to 1] + //I-Code SLIX-L [IC id = 03 + bit36 set to 1] + { 0x04, 0x01, 0xFF, "IC SL2 ICS20/ICS21(SLI) ICS2002/ICS2102(SLIX)" }, + { 0x04, 0x02, 0xFF, "IC SL2 ICS53/ICS54(SLI-S) ICS5302/ICS5402(SLIX-S)" }, + { 0x04, 0x03, 0xFF, "IC SL2 ICS50/ICS51(SLI-L) ICS5002/ICS5102(SLIX-L)" }, + + // 0x05 = Infineon + { 0x05, 0xA1, 0xFF, "SRF55V01P [IC id = 161] plain mode 1kBit"}, + { 0x05, 0xA8, 0xFF, "SRF55V01P [IC id = 168] pilot series 1kBit"}, + { 0x05, 0x40, 0xFF, "SRF55V02P [IC id = 64] plain mode 2kBit"}, + { 0x05, 0x00, 0xFF, "SRF55V10P [IC id = 00] plain mode 10KBit"}, + { 0x05, 0x50, 0xFF, "SRF55V02S [IC id = 80] secure mode 2kBit"}, + { 0x05, 0x10, 0xFF, "SRF55V10S [IC id = 16] secure mode 10KBit"}, + { 0x05, 0x1E, 0xFE, "SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"}, + { 0x05, 0x20, 0xF8, "SLE66r01P [IC id = 3x = My-d Move or My-d move NFC]"}, + + // 0x07 = Texas Instruments + // XX = from bit 41 to bit 43 = product configuration - from bit 44 to bit 47 IC id (Chip ID Family) + //Tag IT RFIDType-I Plus, 2kBit, TI Inlay + //Tag-it HF-I Plus Inlay [IC id = 00] -> b'0000 000 2kBit + //Tag-it HF-I Plus Chip [IC id = 64] -> b'1000 000 2kBit + //Tag-it HF-I Standard Chip / Inlays [IC id = 96] -> b'1100 000 256Bit + //Tag-it HF-I Pro Chip / Inlays [IC id = 98] -> b'1100 010 256Bit, Password protection + { 0x07, 0x00, 0xF0, "Tag-it HF-I Plus Inlay; 64x32bit" }, + { 0x07, 0x10, 0xF0, "Tag-it HF-I Plus Chip; 64x32bit" }, + { 0x07, 0x80, 0xFE, "Tag-it HF-I Plus (RF-HDT-DVBB tag or Third Party Products)" }, + { 0x07, 0xC0, 0xFE, "Tag-it HF-I Standard; 8x32bit" }, + { 0x07, 0xC4, 0xFE, "Tag-it HF-I Pro; 8x23bit; password" }, + + + // 0x16 = EM Microelectronic-Marin SA Switzerland (Skidata) + { 0x16, 0x04, 0xFF, "EM4034 [IC id = 01] (Read/Write - no AFI)"}, + { 0x16, 0x0C, 0xFF, "EM4035 [IC id = 03] (Read/Write - replaced by 4233)"}, + { 0x16, 0x10, 0xFF, "EM4135 [IC id = 04] (Read/Write - replaced by 4233) 36x64bit start page 13"}, + { 0x16, 0x14, 0xFF, "EM4036 [IC id = 05] 28pF"}, + { 0x16, 0x18, 0xFF, "EM4006 [IC id = 06] (Read Only)"}, + { 0x16, 0x1C, 0xFF, "EM4133 [IC id = 07] 23,5pF (Read/Write)"}, + { 0x16, 0x20, 0xFF, "EM4033 [IC id = 08] 23,5pF (Read Only - no AFI / no DSFID / no security blocks)"}, + { 0x16, 0x24, 0xFF, "EM4233 [IC id = 09] 23,5pF CustomerID-102"}, + { 0x16, 0x28, 0xFF, "EM4233 SLIC [IC id = 10] 23,5pF (1Kb flash memory - not provide High Security mode and QuietStorage feature)" }, + { 0x16, 0x3C, 0xFF, "EM4237 [IC id = 15] 23,5pF"}, + { 0x16, 0x7C, 0xFF, "EM4233 [IC id = 31] 95pF"}, + { 0x16, 0x94, 0xFF, "EM4036 [IC id = 37] 95pF 51x64bit "}, + { 0x16, 0x9c, 0xFF, "EM4133 [IC id = 39] 95pF (Read/Write)" }, + { 0x16, 0xA8, 0xFF, "EM4233 SLIC [IC id = 42] 97pF" }, + { 0x16, 0xBC, 0xFF, "EM4237 [IC id = 47] 97pF" }, + + { 0x00, 0x00, 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 *getChipInfo(uint8_t vendorID, uint8_t chipID) { + int i = 0; + int best = -1; + while (chipIDmapping[i].mask > 0) { + if (vendorID == chipIDmapping[i].manufacturer + && (chipID & chipIDmapping[i].mask) == chipIDmapping[i].chipID) { + if (best == -1) { + best = i; + } else { + if (chipIDmapping[i].mask > chipIDmapping[best].mask) { + best = i; + } + } + } + i++; + } + + if (best >= 0) return chipIDmapping[best].desc; + + return chipIDmapping[i].desc; +} diff --git a/client/taginfo.h b/client/taginfo.h new file mode 100644 index 00000000..6c1d6d42 --- /dev/null +++ b/client/taginfo.h @@ -0,0 +1,13 @@ +//----------------------------------------------------------------------------- +// ISO/IEC 7816-6 manufacturer byte decoding +//----------------------------------------------------------------------------- + +#ifndef MANUFACTURERS_H__ +#define MANUFACTURERS_H__ + +#include + +extern char *getManufacturerName(uint8_t vendorID); +extern char *getChipInfo(uint8_t vendorID, uint8_t chipID); + +#endif