]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf15.c
chg: too many \ slashes
[proxmark3-svn] / client / cmdhf15.c
index b843730f65fcd3dcd10a0145beed54682689d35c..d17e7cd1f6ffcaea4da07b51d68bd30e70b23117 100644 (file)
 #include "iso15693tools.h"
 #include "cmdmain.h"
 
 #include "iso15693tools.h"
 #include "cmdmain.h"
 
-#define FrameSOF              Iso15693FrameSOF
-#define Logic0                                         Iso15693Logic0
-#define Logic1                                         Iso15693Logic1
-#define FrameEOF                                       Iso15693FrameEOF
+#define FrameSOF                               Iso15693FrameSOF
+#define Logic0                                 Iso15693Logic0
+#define Logic1                                 Iso15693Logic1
+#define FrameEOF                               Iso15693FrameEOF
 
 
-#define Crc(data,datalen)     Iso15693Crc(data,datalen)
-#define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
+#define Crc(data,datalen)              Iso15693Crc(data,datalen)
+#define AddCrc(data,datalen)   Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)  Iso15693sprintUID(target,uid)
 
 // structure and database for uid -> tagtype lookups 
 #define sprintUID(target,uid)  Iso15693sprintUID(target,uid)
 
 // structure and database for uid -> tagtype lookups 
@@ -132,13 +132,23 @@ const productName uidmapping[] = {
        { 0xE014000000000000LL, 16, "SHARP Corporation Japan" },
        { 0xE015000000000000LL, 16, "ATMEL France" },
        
        { 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? no 'read', just 'readmulti'" },
-       { 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" },
-       { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
-       { 0xE016240000000000LL, 24, "EM-Marin SA (Skidata); EM4233;" },
-       { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" },
-       
+       { 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" },
        { 0xE017000000000000LL, 16, "KSW Microtec GmbH Germany" },
        { 0xE018000000000000LL, 16, "ZMD AG Germany" },
        { 0xE019000000000000LL, 16, "XICOR, Inc. USA" },
@@ -165,9 +175,9 @@ const productName uidmapping[] = {
        { 0xE02E000000000000LL, 16, "Broadcom Corporation USA" },
        { 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" },
        { 0xE030000000000000LL, 16, "BeeDar Technology Inc. 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" }, 
+       { 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" },
        { 0xE034000000000000LL, 16, "Mikron JSC Russia" },
        { 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
        { 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
@@ -197,23 +207,22 @@ int getUID(uint8_t *buf)
        UsbCommand resp;
        uint8_t *recv;
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
        UsbCommand resp;
        uint8_t *recv;
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-       uint8_t *req=c.d.asBytes;
-       int reqlen=0;
+       uint8_t *req = c.d.asBytes;
+       int reqlen = 0;
        
        
-       for (int retry=0;retry<3; retry++) { // don't give up the at the first try              
+       for (int retry = 0; retry <3; retry++) { // don't give up the at the first try          
                
                
-               req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                       ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
-               req[1]=ISO15_CMD_INVENTORY;
-               req[2]=0; // mask length
-               reqlen=AddCrc(req,3);
-               c.arg[0]=reqlen;
+               req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
+               req[1] = ISO15_CMD_INVENTORY;
+               req[2] = 0; // mask length
+               reqlen = AddCrc(req, 3);
+               c.arg[0] = reqlen;
        
                SendCommand(&c);
                
        
                SendCommand(&c);
                
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
                        recv = resp.d.asBytes;
                        recv = resp.d.asBytes;
-                       if (resp.arg[0]>=12 && ISO15_CRC_CHECK==Crc(recv,12)) {
+                       if (resp.arg[0] >= 12 && ISO15_CRC_CHECK == Crc(recv,12)) {
                           memcpy(buf,&recv[2],8);
                           return 1;
                        } 
                           memcpy(buf,&recv[2],8);
                           return 1;
                        } 
@@ -228,16 +237,16 @@ int getUID(uint8_t *buf)
 //             uid[8]  tag uid
 // returns description of the best match       
 static char* getTagInfo(uint8_t *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);
+       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 ((myuid & mask) == uidmapping[i].uid) {
-                       if (best==-1) { 
-                               best=i;
+                       if (best == -1) { 
+                               best = i;
                        } else {
                        } else {
-                               if (uidmapping[i].mask>uidmapping[best].mask) {
+                               if (uidmapping[i].mask > uidmapping[best].mask) {
                                        best=i;
                                }
                        }                                       
                                        best=i;
                                }
                        }                                       
@@ -245,8 +254,8 @@ static char* getTagInfo(uint8_t *uid) {
                i++;
        } 
 
                i++;
        } 
 
-       if (best>=0) return uidmapping[best].desc;
-       
+       if (best >= 0)
+               return uidmapping[best].desc;
        return uidmapping[i].desc; 
 }
 
        return uidmapping[i].desc; 
 }
 
@@ -283,7 +292,7 @@ int CmdHF15Demod(const char *Cmd)
        // First, correlate for SOF
        for (i = 0; i < 100; i++) {
                int corr = 0;
        // First, correlate for SOF
        for (i = 0; i < 100; i++) {
                int corr = 0;
-               for (j = 0; j < arraylen(FrameSOF); j += skip) {
+               for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
                        corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
                }
                if (corr > max) {
                        corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
                }
                if (corr > max) {
@@ -291,23 +300,22 @@ int CmdHF15Demod(const char *Cmd)
                        maxPos = i;
                }
        }
                        maxPos = i;
                }
        }
-       PrintAndLog("SOF at %d, correlation %d", maxPos,
-               max / (arraylen(FrameSOF) / skip));
+       PrintAndLog("SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
        
        
-       i = maxPos + arraylen(FrameSOF) / skip;
+       i = maxPos + ARRAYLEN(FrameSOF) / skip;
        int k = 0;
        uint8_t outBuf[20];
        memset(outBuf, 0, sizeof(outBuf));
        uint8_t mask = 0x01;
        for (;;) {
                int corr0 = 0, corr1 = 0, corrEOF = 0;
        int k = 0;
        uint8_t outBuf[20];
        memset(outBuf, 0, sizeof(outBuf));
        uint8_t mask = 0x01;
        for (;;) {
                int corr0 = 0, corr1 = 0, corrEOF = 0;
-               for (j = 0; j < arraylen(Logic0); j += skip) {
+               for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
                        corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
                }
                        corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
                }
-               for (j = 0; j < arraylen(Logic1); j += skip) {
+               for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
                        corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
                }
                        corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
                }
-               for (j = 0; j < arraylen(FrameEOF); j += skip) {
+               for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
                        corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
                }
                // Even things out by the length of the target waveform.
                        corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
                }
                // Even things out by the length of the target waveform.
@@ -318,17 +326,17 @@ int CmdHF15Demod(const char *Cmd)
                        PrintAndLog("EOF at %d", i);
                        break;
                } else if (corr1 > corr0) {
                        PrintAndLog("EOF at %d", i);
                        break;
                } else if (corr1 > corr0) {
-                       i += arraylen(Logic1) / skip;
+                       i += ARRAYLEN(Logic1) / skip;
                        outBuf[k] |= mask;
                } else {
                        outBuf[k] |= mask;
                } else {
-                       i += arraylen(Logic0) / skip;
+                       i += ARRAYLEN(Logic0) / skip;
                }
                mask <<= 1;
                if (mask == 0) {
                        k++;
                        mask = 0x01;
                }
                }
                mask <<= 1;
                if (mask == 0) {
                        k++;
                        mask = 0x01;
                }
-               if ((i + (int)arraylen(FrameEOF)) >= GraphTraceLen) {
+               if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
                        PrintAndLog("ran off end!");
                        break;
                }
                        PrintAndLog("ran off end!");
                        break;
                }
@@ -364,6 +372,20 @@ int CmdHF15Record(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 
+int HF15Reader(const char *Cmd, bool verbose)
+{
+       uint8_t uid[8];
+
+       if (!getUID(uid)) {
+               if (verbose) PrintAndLog("No Tag found.");
+               return 0;
+       }
+
+       PrintAndLog("Tag UID : %s",sprintUID(NULL,uid));
+       PrintAndLog("Tag Info: %s",getTagInfo(uid));
+       return 1;
+}
+
 int CmdHF15Reader(const char *Cmd)
 {
        UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
 int CmdHF15Reader(const char *Cmd)
 {
        UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
@@ -411,14 +433,14 @@ int CmdHF15Afi(const char *Cmd)
 
 // Reads all memory pages
 int CmdHF15DumpMem(const char*Cmd) {
 
 // Reads all memory pages
 int CmdHF15DumpMem(const char*Cmd) {
+
+       uint8_t uid[8] = {0,0,0,0,0,0,0,0};     
+       uint8_t *recv = NULL;
        UsbCommand resp;
        UsbCommand resp;
-       uint8_t uid[8]; 
-       uint8_t *recv=NULL;
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-       uint8_t *req=c.d.asBytes;
-       int reqlen=0;
-       int blocknum=0;
-       char output[80];
+       uint8_t *req = c.d.asBytes;
+       int reqlen = 0, blocknum = 0;
+       char output[80] = {0};
                
        if (!getUID(uid)) {
                PrintAndLog("No Tag found.");
                
        if (!getUID(uid)) {
                PrintAndLog("No Tag found.");
@@ -444,22 +466,22 @@ int CmdHF15DumpMem(const char*Cmd) {
                        recv = resp.d.asBytes;
                        if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
                                if (!(recv[0] & ISO15_RES_ERROR)) {
                        recv = resp.d.asBytes;
                        if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
                                if (!(recv[0] & ISO15_RES_ERROR)) {
-                                       retry=0;
-                                       *output=0; // reset outputstring
+                                       retry = 0;
+                                       *output = 0; // reset outputstring
                                        sprintf(output, "Block %02x   ",blocknum);
                                        for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
                                                sprintf(output+strlen(output),"%02X ",recv[i]);
                                        }                                       
                                        strcat(output,"   "); 
                                        sprintf(output, "Block %02x   ",blocknum);
                                        for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
                                                sprintf(output+strlen(output),"%02X ",recv[i]);
                                        }                                       
                                        strcat(output,"   "); 
-                                       for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii
-                                               sprintf(output+strlen(output),"%c",(recv[i]>31 && recv[i]<127)?recv[i]:'.');                                    
+                                       for ( int i = 1; i < resp.arg[0]-2; i++) { // data in cleaned ascii
+                                               sprintf(output+strlen(output),"%c",(recv[i] > 31 && recv[i] < 127) ? recv[i] : '.');                                    
                                        }                                       
                                        PrintAndLog("%s",output);       
                                        blocknum++;
                                        // PrintAndLog("bn=%i",blocknum);
                                } else {
                                        PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
                                        }                                       
                                        PrintAndLog("%s",output);       
                                        blocknum++;
                                        // PrintAndLog("bn=%i",blocknum);
                                } else {
                                        PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-                                       return 0;
+                                       return 1;
                                }
                        } // else PrintAndLog("crc");
                } // else PrintAndLog("r null");
                                }
                        } // else PrintAndLog("crc");
                } // else PrintAndLog("r null");
@@ -471,7 +493,7 @@ int CmdHF15DumpMem(const char*Cmd) {
 //             PrintAndLog("CRC Failed");
 //     else 
 //             PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
 //             PrintAndLog("CRC Failed");
 //     else 
 //             PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-       return 0;
+       return 1;
 }
 
 
 }
 
 
@@ -488,7 +510,7 @@ static command_t CommandTable15[] =
        {"cmd",     CmdHF15Cmd,     0, "Send direct commands to ISO15693 tag"},
        {"findafi", CmdHF15Afi,     0, "Brute force AFI of an ISO15693 tag"},
        {"dumpmemory", CmdHF15DumpMem,     0, "Read all memory pages of an ISO15693 tag"},
        {"cmd",     CmdHF15Cmd,     0, "Send direct commands to ISO15693 tag"},
        {"findafi", CmdHF15Afi,     0, "Brute force AFI of an ISO15693 tag"},
        {"dumpmemory", CmdHF15DumpMem,     0, "Read all memory pages of an ISO15693 tag"},
-               {NULL, NULL, 0, NULL}
+       {NULL, NULL, 0, NULL}
 };
 
 int CmdHF15(const char *Cmd)
 };
 
 int CmdHF15(const char *Cmd)
@@ -658,9 +680,9 @@ int CmdHF15CmdRaw (const char *cmd) {
  */
 int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
        int temp;
  */
 int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
        int temp;
-       uint8_t *req=c->d.asBytes;
+       uint8_t *req = c->d.asBytes;
        uint8_t uid[8] = {0x00};
        uint8_t uid[8] = {0x00};
-       uint32_t reqlen=0;
+       uint32_t reqlen = 0;
 
        // strip
        while (**cmd==' ' || **cmd=='\t') (*cmd)++;
 
        // strip
        while (**cmd==' ' || **cmd=='\t') (*cmd)++;
@@ -753,10 +775,10 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
        UsbCommand resp;
        uint8_t *recv;
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
        UsbCommand resp;
        uint8_t *recv;
        UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
-       uint8_t *req=c.d.asBytes;
-       int reqlen=0;
+       uint8_t *req = c.d.asBytes;
+       int reqlen = 0;
        char cmdbuf[100];
        char cmdbuf[100];
-       char *cmd=cmdbuf;
+       char *cmd = cmdbuf;
        char output[2048]="";
        int i;
        
        char output[2048]="";
        int i;
        
@@ -778,7 +800,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
        }       
        
        prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);      
        }       
        
        prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);      
-       reqlen=c.arg[0];
+       reqlen = c.arg[0];
        
        reqlen=AddCrc(req,reqlen);
        c.arg[0]=reqlen;
        
        reqlen=AddCrc(req,reqlen);
        c.arg[0]=reqlen;
Impressum, Datenschutz