]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf15.c
added 'hf 15 cmd sysinfo' using Adrian's second patch from issue 20
[proxmark3-svn] / client / cmdhf15.c
index 886e5c5198387e3fe8c4c33393ad57b83d149fd6..0b8680c0667aff55f572ac9e0ae5089709976795 100644 (file)
@@ -54,15 +54,29 @@ typedef struct {
 
 
 const productName uidmapping[] = {
+       { 0xE001000000000000LL, 16, "Motorola" },
+       { 0xE002000000000000LL, 16, "ST Microelectronics" },
+       { 0xE003000000000000LL, 16, "Hitachi" },
+       { 0xE004000000000000LL, 16, "Philips" },
+       { 0xE004010000000000LL, 24, "Philips; IC SL2 ICS20" },
+       { 0xE005000000000000LL, 16, "Infineon" },
+       { 0xE005400000000000LL, 24, "Infineon; 56x32bit" },
+       { 0xE006000000000000LL, 16, "Cylinc" },
        { 0xE007000000000000LL, 16, "Texas Instrument; " },
        { 0xE007000000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Inlay; 64x32bit" },
        { 0xE007100000000000LL, 20, "Texas Instrument; Tag-it HF-I Plus Chip; 64x32bit" },
        { 0xE007C00000000000LL, 23, "Texas Instrument; Tag-it HF-I Standard; 8x32bit" },
        { 0xE007C40000000000LL, 23, "Texas Instrument; Tag-it HF-I Pro; 8x23bit; password" },   
-       { 0xE005000000000000LL, 16, "Infineon" },
-       { 0xE005400000000000LL, 24, "Infineon; 56x32bit" },
-       { 0xE004000000000000LL, 16, "Philips" },
-       { 0xE002000000000000LL, 16, "STMicroelectronics" },
+       { 0xE008000000000000LL, 16, "Fujitsu" },
+       { 0xE009000000000000LL, 16, "Matsushita" },
+       { 0xE00A000000000000LL, 16, "NEC" },
+       { 0xE00B000000000000LL, 16, "Oki Electric" },
+       { 0xE00C000000000000LL, 16, "Toshiba" },
+       { 0xE00D000000000000LL, 16, "Mitsubishi" },
+       { 0xE00E000000000000LL, 16, "Samsung" },
+       { 0xE00F000000000000LL, 16, "Hyundai" },
+       { 0xE010000000000000LL, 16, "LG-Semiconductors" },
+       { 0xE012000000000000LL, 16, "HID Corporation" },
        { 0xE016000000000000LL, 16, "EM-Marin SA (Skidata)" },
        { 0xE016040000000000LL, 24, "EM-Marin SA (Skidata Keycard-eco); no memory" },
        { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
@@ -70,8 +84,8 @@ const productName uidmapping[] = {
 };
 
 
-// fast method to just read the UID of an tag (collission detection not supported)
-//             *buf    shouls be large enough to fit the 64bit uid
+// fast method to just read the UID of a tag (collission detection not supported)
+//             *buf    should be large enough to fit the 64bit uid
 // returns 1 if suceeded
 int getUID(uint8_t *buf) 
 {
@@ -111,7 +125,7 @@ int getUID(uint8_t *buf)
 //             uid[8]  tag uid
 // returns description of the best match       
 static char* getTagInfo(uint8_t *uid) {
-       uint64_t myuid,mask,t;
+       uint64_t myuid,mask;
        int i=0, best=-1;       
        memcpy(&myuid,uid,sizeof(uint64_t));
        while (uidmapping[i].mask>0) {
@@ -134,10 +148,20 @@ static char* getTagInfo(uint8_t *uid) {
 }
 
 
-// will return a clear-text message to an errorcode
+// return a clear-text message to an errorcode
 static char* TagErrorStr(uint8_t error) {
-       // TODO
-       return NULL;
+       switch (error) {
+               case 0x01: return "The command is not supported";
+               case 0x02: return "The command is not recognised";
+               case 0x03: return "The option is not supported.";
+               case 0x0f: return "Unknown error.";
+               case 0x10: return "The specified block is not available (doesn’t exist).";
+               case 0x11: return "The specified block is already -locked and thus cannot be locked again";
+               case 0x12: return "The specified block is locked and its content cannot be changed.";
+               case 0x13: return "The specified block was not successfully programmed.";
+               case 0x14: return "The specified block was not successfully locked.";
+               default: return "Reserved for Future Use or Custom command error.";
+       }
 }
 
 
@@ -312,7 +336,7 @@ int CmdHF15DumpMem(const char*Cmd) {
                                        blocknum++;
                                        // PrintAndLog("bn=%i",blocknum);
                                } else {
-                                       PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0])); 
+                                       PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
                                        return 0;
                                }
                        } // else PrintAndLog("crc");
@@ -324,7 +348,7 @@ int CmdHF15DumpMem(const char*Cmd) {
        else if (r && ISO15_CRC_CHECK!=Crc(r->d.asBytes,r->arg[0]))
                PrintAndLog("CRC Failed");
        else 
-               PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0])); 
+               PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
        return 0;
 }
 
@@ -509,7 +533,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
        while (**cmd==' ' || **cmd=='\t') (*cmd)++;
        
        if (strstr(*cmd,"-2")==*cmd) {
-               c->arg[1]=0; // quse 1of256
+               c->arg[1]=0; // use 1of256
                (*cmd)+=2;
        }
 
@@ -589,6 +613,98 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
 
 
 
+/**
+ * Commandline handling: HF15 CMD SYSINFO
+ * get system information from tag/VICC
+ */
+int CmdHF15CmdSysinfo(const char *Cmd) {
+       UsbCommand *r;  
+       uint8_t *recv;
+       UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
+       uint8_t *req=c.d.asBytes;
+       int reqlen=0;
+       char cmdbuf[100];
+       char *cmd=cmdbuf;
+       char output[2048]="";
+       int i;
+       
+       strncpy(cmd,Cmd,99);
+
+       // usage:
+       if (strlen(cmd)<1) {
+               PrintAndLog("Usage:  hf 15 cmd sysinfo    [options] <uid|s|*>");
+               PrintAndLog("           options:");
+               PrintAndLog("               -2        use slower '1 out of 256' mode");
+               PrintAndLog("           uid (either): ");
+               PrintAndLog("               <8B hex>  full UID eg E011223344556677");
+               PrintAndLog("               s         selected tag");
+               PrintAndLog("               u         unaddressed mode");
+               PrintAndLog("               *         scan for tag");
+               PrintAndLog("           start#:       page number to start 0-255");  
+               PrintAndLog("           count#:       number of pages");  
+               return 0;
+       }       
+       
+       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);      
+       reqlen=c.arg[0];
+       
+       reqlen=AddCrc(req,reqlen);
+       c.arg[0]=reqlen;
+
+       SendCommand(&c);
+
+       r=WaitForResponseTimeout(CMD_ACK,1000);
+       
+       if (r!=NULL && r->arg[0]>2) {
+               recv = r->d.asBytes;
+               if (ISO15_CRC_CHECK==Crc(recv,r->arg[0])) {
+                       if (!(recv[0] & ISO15_RES_ERROR)) {
+                               *output=0; // reset outputstring
+                               for ( i=1; i<r->arg[0]-2; i++) {
+                                       sprintf(output+strlen(output),"%02hX ",recv[i]);                                        
+                               }                                       
+                               strcat(output,"\n\r");
+                               strcat(output,"UID = ");
+                               strcat(output,sprintUID(NULL,recv+2));
+                               strcat(output,"\n\r");
+                               strcat(output,getTagInfo(recv+2)); //ABC
+                               strcat(output,"\n\r");
+                               i=10;
+                               if (recv[1] & 0x01) 
+                                       sprintf(output+strlen(output),"DSFID supported, set to %02hX\n\r",recv[i++]);
+                               else 
+                                       strcat(output,"DSFID not supported\n\r");
+                               if (recv[1] & 0x02) 
+                                       sprintf(output+strlen(output),"AFI supported, set to %03hX\n\r",recv[i++]);
+                               else 
+                                       strcat(output,"AFI not supported\n\r");
+                               if (recv[1] & 0x04) {
+                                       strcat(output,"Tag provides info on memory layout (vendor dependent)\n\r");
+                                       sprintf(output+strlen(output)," %i (or %i) bytes/page x %i pages \n\r",
+                                                       (recv[i+1]&0x1F)+1, (recv[i+1]&0x1F), recv[i]+1);
+                                       i+=2;
+                               } else 
+                                       strcat(output,"Tag does not provide information on memory layout\n\r");
+                               if (recv[1] & 0x08) sprintf(output+strlen(output),"IC reference given: %02hX\n\r",recv[i++]);
+                                       else strcat(output,"IC reference not given\n\r");
+
+
+                               PrintAndLog("%s",output);       
+                       } else {
+                               PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0])); 
+                       }                  
+               } else {
+                       PrintAndLog("CRC failed");
+               }
+       } else {
+               PrintAndLog("no answer");
+       }
+       
+       return 0;
+}
+
+
+
 int CmdHF15CmdRead(const char *Cmd) {
        UsbCommand *r;  
        uint8_t *recv;
@@ -644,12 +760,12 @@ int CmdHF15CmdRead(const char *Cmd) {
                                        sprintf(output+strlen(output),"%02hX ",recv[i]);                                        
                                }                                       
                                strcat(output,"   ");
-                               for ( int i=2; i<r->arg[0]-2; i++) {
-                                       sprintf(output+strlen(output),"%c",recv[i]>31 || recv[i]<127?recv[i]:'.');                                      
+                               for ( int i=1; i<r->arg[0]-2; i++) {
+                                       sprintf(output+strlen(output),"%c",recv[i]>31 && recv[i]<127?recv[i]:'.');                                      
                                }                                       
                                PrintAndLog("%s",output);       
                        } else {
-                               PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0])); 
+                               PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
                        }                  
                } else {
                        PrintAndLog("CRC failed");
@@ -731,7 +847,7 @@ int CmdHF15CmdWrite(const char *Cmd) {
                        if (!(recv[0] & ISO15_RES_ERROR)) {                                     
                                PrintAndLog("OK");      
                        } else {
-                               PrintAndLog("Tag returned Error %i: %s",recv[0],TagErrorStr(recv[0])); 
+                               PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
                        }                  
                } else {
                        PrintAndLog("CRC failed");
@@ -757,6 +873,7 @@ static command_t CommandTable15Cmd[] =
 /*
        {"readmulti",CmdHF15CmdReadmulti,    0, "Reads multiple Blocks"},
 */     
+       {"sysinfo",      CmdHF15CmdSysinfo,     0,      "Get Card Information"},
        {"raw",          CmdHF15CmdRaw,         0,      "Send raw hex data to tag"}, 
        {"debug",    CmdHF15CmdDebug,    0, "Turn debugging on/off"},
        {NULL, NULL, 0, NULL}
Impressum, Datenschutz