]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf15.c
projects / proxmark3-svn / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix WaitForResponse (without timeout)
[proxmark3-svn] / client / cmdhf15.c
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 2239e9e4634ff151e5181050800af12e294d574a..cc86841b2d0d61d0a22fda9e57d82e74940749d0 100644 (file)
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -22,131 +22,100 @@
 // the client. Signal Processing & decoding is done on the pc. This is the slowest
 // variant, but offers the possibility to analyze the waveforms directly. 
 
 // the client. Signal Processing & decoding is done on the pc. This is the slowest
 // variant, but offers the possibility to analyze the waveforms directly. 
 
+#include "cmdhf15.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-//#include "proxusb.h"
-#include "proxmark3.h"
-#include "data.h"
+
+#include "comms.h"
 #include "graph.h"
 #include "ui.h"
 #include "graph.h"
 #include "ui.h"
+#include "util.h"
 #include "cmdparser.h"
 #include "cmdparser.h"
-#include "cmdhf15.h"
 #include "iso15693tools.h"
 #include "iso15693tools.h"
+#include "protocols.h"
 #include "cmdmain.h"
 #include "cmdmain.h"
-
-#define FrameSOF              Iso15693FrameSOF
-#define Logic0                                         Iso15693Logic0
-#define Logic1                                         Iso15693Logic1
-#define FrameEOF                                       Iso15693FrameEOF
+#include "taginfo.h"
 
 #define Crc(data,datalen)     Iso15693Crc(data,datalen)
 #define AddCrc(data,datalen)  Iso15693AddCrc(data,datalen)
 #define sprintUID(target,uid)  Iso15693sprintUID(target,uid)
 
 
 #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 
-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" },
-       { 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" },
-       { 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" },
-       { 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); EM4034? no 'read', just 'readmulti'" },
-       { 0xE0160c0000000000LL, 24, "EM-Marin SA; EM4035?" },
-       { 0xE016100000000000LL, 24, "EM-Marin SA (Skidata); EM4135; 36x64bit start page 13" },
-       { 0xE016940000000000LL, 24, "EM-Marin SA (Skidata); 51x64bit" },
-       { 0,0,"no tag-info available" } // must be the last entry
+// SOF defined as
+// 1) Unmodulated time of 56.64us
+// 2) 24 pulses of 423.75khz
+// 3) logic '1' (unmodulated for 18.88us followed by 8 pulses of 423.75khz)
+
+static const int Iso15693FrameSOF[] = {
+       -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+       -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+       -1, -1, -1, -1,
+       -1, -1, -1, -1,
+        1,  1,  1,  1,
+        1,  1,  1,  1
+};
+static const int Iso15693Logic0[] = {
+        1,  1,  1,  1,
+        1,  1,  1,  1,
+       -1, -1, -1, -1,
+       -1, -1, -1, -1
+};
+static const int Iso15693Logic1[] = {
+       -1, -1, -1, -1,
+       -1, -1, -1, -1,
+        1,  1,  1,  1,
+        1,  1,  1,  1
+};
+
+// EOF defined as
+// 1) logic '0' (8 pulses of 423.75khz followed by unmodulated for 18.88us)
+// 2) 24 pulses of 423.75khz
+// 3) Unmodulated time of 56.64us
+
+static const int Iso15693FrameEOF[] = {
+        1,  1,  1,  1,
+        1,  1,  1,  1,
+       -1, -1, -1, -1,
+       -1, -1, -1, -1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+       -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+       -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
 
 // fast method to just read the UID of a tag (collission detection not supported)
 //             *buf    should 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) 
-{
+// returns true if suceeded
+static bool 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;
+       uint8_t *req = c.d.asBytes;
        int reqlen=0;
        
        int reqlen=0;
        
-       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;
+       for (int retry = 0;retry < 3; retry++) { // don't give up the at the first try          
+               req[0] = ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_INVENTORY | ISO15693_REQINV_SLOT1;
+               req[1] = ISO15693_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)) {
-                          memcpy(buf,&recv[2],8);
-                          return 1;
+                       if (resp.arg[0] >= 12 && ISO15693_CRC_CHECK == Crc(recv, 12)) {
+                          memcpy(buf, &recv[2], 8);
+                          return true;
                        } 
                } 
        } // retry
                        } 
                } 
        } // retry
-       return 0;
-}
-
-
-
-// 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 false;
 }
 
 
 }
 
 
@@ -157,7 +126,7 @@ static char* TagErrorStr(uint8_t error) {
                case 0x02: return "The command is not recognised";
                case 0x03: return "The option is not supported.";
                case 0x0f: return "Unknown error.";
                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 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 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.";
@@ -168,22 +137,21 @@ static char* TagErrorStr(uint8_t error) {
 
 
 // Mode 3
 
 
 // Mode 3
-int CmdHF15Demod(const char *Cmd)
-{
+static int CmdHF15Demod(const char *Cmd) {
        // The sampling rate is 106.353 ksps/s, for T = 18.8 us
        
        int i, j;
        int max = 0, maxPos = 0;
 
        // The sampling rate is 106.353 ksps/s, for T = 18.8 us
        
        int i, j;
        int max = 0, maxPos = 0;
 
-       int skip = 4;
+       int skip = 2;
 
 
-       if (GraphTraceLen < 1000) return 0;
+       if (GraphTraceLen < 2000) return 0;
 
        // First, correlate for SOF
 
        // First, correlate for SOF
-       for (i = 0; i < 100; i++) {
+       for (i = 0; i < 200; i++) {
                int corr = 0;
                int corr = 0;
-               for (j = 0; j < arraylen(FrameSOF); j += skip) {
-                       corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
+               for (j = 0; j < arraylen(Iso15693FrameSOF); j += skip) {
+                       corr += Iso15693FrameSOF[j] * GraphBuffer[i + (j / skip)];
                }
                if (corr > max) {
                        max = corr;
                }
                if (corr > max) {
                        max = corr;
@@ -191,43 +159,50 @@ int CmdHF15Demod(const char *Cmd)
                }
        }
        PrintAndLog("SOF at %d, correlation %d", maxPos,
                }
        }
        PrintAndLog("SOF at %d, correlation %d", maxPos,
-               max / (arraylen(FrameSOF) / skip));
+               max / (arraylen(Iso15693FrameSOF) / skip));
        
        
-       i = maxPos + arraylen(FrameSOF) / skip;
+       i = maxPos + arraylen(Iso15693FrameSOF) / skip;
        int k = 0;
        uint8_t outBuf[20];
        memset(outBuf, 0, sizeof(outBuf));
        uint8_t mask = 0x01;
        for (;;) {
        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) {
-                       corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
-               }
-               for (j = 0; j < arraylen(Logic1); j += skip) {
-                       corr1 += Logic1[j] * GraphBuffer[i + (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.
-               corr0 *= 4;
-               corr1 *= 4;
-               
-               if (corrEOF > corr1 && corrEOF > corr0) {
-                       PrintAndLog("EOF at %d", i);
-                       break;
+                       int corr0 = 0, corr00 = 0, corr01 = 0, corr1 = 0, corrEOF = 0;
+                       for(j = 0; j < arraylen(Iso15693Logic0); j += skip) {
+                               corr0 += Iso15693Logic0[j]*GraphBuffer[i+(j/skip)];
+                       }
+                       corr01 = corr00 = corr0;
+                       for(j = 0; j < arraylen(Iso15693Logic0); j += skip) {
+                               corr00 += Iso15693Logic0[j]*GraphBuffer[i+arraylen(Iso15693Logic0)/skip+(j/skip)];
+                               corr01 += Iso15693Logic1[j]*GraphBuffer[i+arraylen(Iso15693Logic0)/skip+(j/skip)];
+                       }
+                       for(j = 0; j < arraylen(Iso15693Logic1); j += skip) {
+                               corr1 += Iso15693Logic1[j]*GraphBuffer[i+(j/skip)];
+                       }
+                       for(j = 0; j < arraylen(Iso15693FrameEOF); j += skip) {
+                               corrEOF += Iso15693FrameEOF[j]*GraphBuffer[i+(j/skip)];
+                       }
+                       // Even things out by the length of the target waveform.
+                       corr00 *= 2;
+                       corr01 *= 2;
+                       corr0 *= 4;
+                       corr1 *= 4;
+       
+                       if(corrEOF > corr1 && corrEOF > corr00 && corrEOF > corr01) {
+                               PrintAndLog("EOF at %d", i);
+                               break;
                } else if (corr1 > corr0) {
                } else if (corr1 > corr0) {
-                       i += arraylen(Logic1) / skip;
+                       i += arraylen(Iso15693Logic1) / skip;
                        outBuf[k] |= mask;
                } else {
                        outBuf[k] |= mask;
                } else {
-                       i += arraylen(Logic0) / skip;
+                       i += arraylen(Iso15693Logic0) / 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(Iso15693FrameEOF)) >= GraphTraceLen) {
                        PrintAndLog("ran off end!");
                        break;
                }
                        PrintAndLog("ran off end!");
                        break;
                }
@@ -246,49 +221,85 @@ int CmdHF15Demod(const char *Cmd)
 }
 
 
 }
 
 
-
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
 // * Acquire Samples as Reader (enables carrier, sends inquiry)
-int CmdHF15Read(const char *Cmd)
-{
+static int CmdHF15Read(const char *Cmd) {
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693};
        SendCommand(&c);
        return 0;
 }
 
        UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693};
        SendCommand(&c);
        return 0;
 }
 
-// Record Activity without enabeling carrier
-int CmdHF15Record(const char *Cmd)
-{
-       UsbCommand c = {CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693};
+
+// Record Activity without enabling carrier
+static int CmdHF15Snoop(const char *Cmd) {
+       UsbCommand c = {CMD_SNOOP_ISO_15693};
        SendCommand(&c);
        return 0;
 }
 
        SendCommand(&c);
        return 0;
 }
 
-int CmdHF15Reader(const char *Cmd)
-{
+
+int HF15Reader(const char *Cmd, bool verbose) {
+       uint8_t uid[8];
+
+       if (!getUID(uid)) {
+               if (verbose) PrintAndLog("No Tag found.");
+               return 0;
+       }
+
+       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;
+}
+
+
+static int CmdHF15Reader(const char *Cmd) {
        UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
        SendCommand(&c);
        return 0;
 }
 
        UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
        SendCommand(&c);
        return 0;
 }
 
+
 // Simulation is still not working very good
 // Simulation is still not working very good
-int CmdHF15Sim(const char *Cmd)
-{
-       UsbCommand c = {CMD_SIMTAG_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
+static int CmdHF15Sim(const char *Cmd) {
+       char cmdp = param_getchar(Cmd, 0);
+       uint8_t uid[8] = {0x00};
+
+       //E0 16 24 00 00 00 00 00
+       if (cmdp == 'h' || cmdp == 'H') {
+               PrintAndLog("Usage:  hf 15 sim <UID>");
+               PrintAndLog("");
+               PrintAndLog("     sample: hf 15 sim E016240000000000");
+               return 0;
+       }
+
+       if (param_gethex(Cmd, 0, uid, 16)) {
+               PrintAndLog("UID must include 16 HEX symbols");
+               return 0;
+       }
+       
+       PrintAndLog("Starting simulating UID %02X %02X %02X %02X %02X %02X %02X %02X",
+                       uid[0],uid[1],uid[2],uid[3],uid[4], uid[5], uid[6], uid[7]);
+       PrintAndLog("Press the button to stop simulation");
+
+       UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
+       memcpy(c.d.asBytes,uid,8);
+       
        SendCommand(&c);
        return 0;
 }
 
        SendCommand(&c);
        return 0;
 }
 
+
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
 // finds the AFI (Application Family Idendifier) of a card, by trying all values
 // (There is no standard way of reading the AFI, allthough some tags support this)
-int CmdHF15Afi(const char *Cmd)
-{
+static int CmdHF15Afi(const char *Cmd) {
        UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
        SendCommand(&c);
        return 0;
 }
 
        UsbCommand c = {CMD_ISO_15693_FIND_AFI, {strtol(Cmd, NULL, 0), 0, 0}};
        SendCommand(&c);
        return 0;
 }
 
+
 // Reads all memory pages
 // Reads all memory pages
-int CmdHF15DumpMem(const char*Cmd) {
+static int CmdHF15DumpMem(const char*Cmd) {
        UsbCommand resp;
        uint8_t uid[8]; 
        uint8_t *recv=NULL;
        UsbCommand resp;
        uint8_t uid[8]; 
        uint8_t *recv=NULL;
@@ -303,28 +314,29 @@ int CmdHF15DumpMem(const char*Cmd) {
                return 0;
        }
        
                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++) {
                
 
        for (int retry=0; retry<5; retry++) {
                
-               req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                       ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-               req[1]=ISO15_CMD_READ;
+               req[0]= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
+               req[1] = ISO15693_READBLOCK;
                memcpy(&req[2],uid,8);
                memcpy(&req[2],uid,8);
-               req[10]=blocknum;
-               reqlen=AddCrc(req,11);
-               c.arg[0]=reqlen;
+               req[10] = blocknum;
+               reqlen = AddCrc(req,11);
+               c.arg[0] = reqlen;
        
                SendCommand(&c);
                
                if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
                        recv = resp.d.asBytes;
        
                SendCommand(&c);
                
                if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
                        recv = resp.d.asBytes;
-                       if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
-                               if (!(recv[0] & ISO15_RES_ERROR)) {
+                       if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
+                               if (!(recv[0] & ISO15693_RES_ERROR)) {
                                        retry=0;
                                        *output=0; // reset outputstring
                                        retry=0;
                                        *output=0; // reset outputstring
-                                       sprintf(output, "Block %2i   ",blocknum);
+                                       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]);
                                        }                                       
                                        for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
                                                sprintf(output+strlen(output),"%02X ",recv[i]);
                                        }                                       
@@ -337,7 +349,7 @@ int CmdHF15DumpMem(const char*Cmd) {
                                        // PrintAndLog("bn=%i",blocknum);
                                } else {
                                        PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
                                        // 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");
@@ -345,68 +357,35 @@ int CmdHF15DumpMem(const char*Cmd) {
   // TODO: need fix
 //     if (resp.arg[0]<3)
 //             PrintAndLog("Lost Connection");
   // TODO: need fix
 //     if (resp.arg[0]<3)
 //             PrintAndLog("Lost Connection");
-//     else if (ISO15_CRC_CHECK!=Crc(resp.d.asBytes,resp.arg[0]))
+//     else if (ISO15693_CRC_CHECK!=Crc(resp.d.asBytes,resp.arg[0]))
 //             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;
-}
-
-
-// "HF 15" interface
-
-static command_t CommandTable15[] = 
-{
-       {"help",    CmdHF15Help,    1, "This help"},
-       {"demod",   CmdHF15Demod,   1, "Demodulate ISO15693 from tag"},
-       {"read",    CmdHF15Read,    0, "Read HF tag (ISO 15693)"},
-       {"record",  CmdHF15Record,  0, "Record Samples (ISO 15693)"}, // atrox
-       {"reader",  CmdHF15Reader,  0, "Act like an ISO15693 reader"},
-       {"sim",     CmdHF15Sim,     0, "Fake 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}
-};
-
-int CmdHF15(const char *Cmd)
-{
-       CmdsParse(CommandTable15, Cmd);
-       return 0;
-}
-
-int CmdHF15Help(const char *Cmd)
-{
-       CmdsHelp(CommandTable15);
-       return 0;
+       return 1;
 }
 
 
 }
 
 
-// "HF 15 Cmd" Interface
-// Allows direct communication with the tag on command level
-
-int CmdHF15CmdInquiry(const char *Cmd) 
-{
+static int CmdHF15CmdInquiry(const char *Cmd) {
        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;
        
        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;
        
-       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
+       req[0] = ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_INVENTORY | ISO15693_REQINV_SLOT1;
+       req[1] = ISO15693_INVENTORY;
+       req[2] = 0; // mask length
        reqlen=AddCrc(req,3);
        reqlen=AddCrc(req,3);
-       c.arg[0]=reqlen;
+       c.arg[0] = reqlen;
 
        SendCommand(&c);
        
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
                if (resp.arg[0]>=12) {
 
        SendCommand(&c);
        
        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]);
                }
                } else {
                        PrintAndLog("Response to short, just %i bytes. No tag?\n",resp.arg[0]);
                }
@@ -418,11 +397,12 @@ int CmdHF15CmdInquiry(const char *Cmd)
 
 
 // Turns debugging on(1)/off(0)
 
 
 // Turns debugging on(1)/off(0)
-int CmdHF15CmdDebug( const char *cmd) {
-       int debug=atoi(cmd);
-       if (strlen(cmd)<1) {
-               PrintAndLog("Usage: hf 15 cmd debug  <0/1>");
-               PrintAndLog("   0..no debugging output  1..turn debugging on"); 
+static int CmdHF15CmdDebug( const char *cmd) {
+       int debug = atoi(cmd);
+       if (strlen(cmd) < 1) {
+               PrintAndLog("Usage: hf 15 debug <0|1>");
+               PrintAndLog("   0 no debugging");
+               PrintAndLog("   1 turn debugging on");  
                return 0;
        }
 
                return 0;
        }
 
@@ -432,7 +412,7 @@ int CmdHF15CmdDebug( const char *cmd) {
 }
 
 
 }
 
 
-int CmdHF15CmdRaw (const char *cmd) {
+static int CmdHF15CmdRaw (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?
@@ -446,7 +426,7 @@ int CmdHF15CmdRaw (const char *cmd) {
        char *hexout;
 
        
        char *hexout;
 
        
-       if (strlen(cmd)<3) {
+       if (strlen(cmd)<2) {
                PrintAndLog("Usage: hf 15 cmd raw  [-r] [-2] [-c] <0A 0B 0C ... hex>");
                PrintAndLog("       -r    do not read response");
                PrintAndLog("       -2    use slower '1 out of 256' mode");
                PrintAndLog("Usage: hf 15 cmd raw  [-r] [-2] [-c] <0A 0B 0C ... hex>");
                PrintAndLog("       -r    do not read response");
                PrintAndLog("       -2    use slower '1 out of 256' mode");
@@ -508,22 +488,31 @@ int CmdHF15CmdRaw (const char *cmd) {
        SendCommand(&c);
        
        if (reply) {
        SendCommand(&c);
        
        if (reply) {
-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
                        recv = resp.d.asBytes;
                        recv = resp.d.asBytes;
-                       PrintAndLog("received %i octets",resp.arg[0]);
-                       hexout = (char *)malloc(resp.arg[0] * 3 + 1);
-                       if (hexout != NULL) {
-                               for (int i = 0; i < resp.arg[0]; i++) { // data in hex
-                                       sprintf(&hexout[i * 3], "%02X ", recv[i]);
+                       int recv_len = resp.arg[0];
+                       if (recv_len == 0) {
+                               PrintAndLog("received SOF only. Maybe Picopass/iCLASS?");
+                       } else if (recv_len > 0) {
+                               PrintAndLog("received %i octets", recv_len);
+                               hexout = (char *)malloc(resp.arg[0] * 3 + 1);
+                               if (hexout != NULL) {
+                                       for (int i = 0; i < resp.arg[0]; i++) { // data in hex
+                                               sprintf(&hexout[i * 3], "%02X ", recv[i]);
+                                       }
+                                       PrintAndLog("%s", hexout);
+                                       free(hexout);
                                }
                                }
-                               PrintAndLog("%s", hexout);
-                               free(hexout);
+                       } else if (recv_len == -1) {
+                               PrintAndLog("card didn't respond");
+                       } else if (recv_len == -2) {
+                               PrintAndLog("receive buffer overflow");
                        }
                } else {
                        PrintAndLog("timeout while waiting for reply.");
                }
                        }
                } else {
                        PrintAndLog("timeout while waiting for reply.");
                }
-               
-       } // if reply
+       }
+
        return 0;
 }
 
        return 0;
 }
 
@@ -533,30 +522,30 @@ int CmdHF15CmdRaw (const char *cmd) {
  * Parameters:
  *  **cmd      command line
  */
  * Parameters:
  *  **cmd      command line
  */
-int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
+static int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
        int temp;
        int temp;
-       uint8_t *req=c->d.asBytes;
-       uint8_t uid[8] = {0};
-       uint32_t reqlen=0;
+       uint8_t *req = c->d.asBytes;
+       uint8_t uid[8] = {0x00};
+       uint32_t reqlen = 0;
 
        // strip
        while (**cmd==' ' || **cmd=='\t') (*cmd)++;
        
 
        // strip
        while (**cmd==' ' || **cmd=='\t') (*cmd)++;
        
-       if (strstr(*cmd,"-2")==*cmd) {
-               c->arg[1]=0; // use 1of256
-               (*cmd)+=2;
+       if (strstr(*cmd, "-2") == *cmd) {
+               c->arg[1] = 0; // use 1of256
+               (*cmd) += 2;
        }
 
        // strip
        }
 
        // strip
-       while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+       while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
        
        
-       if (strstr(*cmd,"-o")==*cmd) {
-               req[reqlen]=ISO15_REQ_OPTION;
-               (*cmd)+=2;
+       if (strstr(*cmd, "-o") == *cmd) {
+               req[reqlen] = ISO15693_REQ_OPTION;
+               (*cmd) += 2;
        }
        
        // strip
        }
        
        // strip
-       while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+       while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
        
        switch (**cmd) {
                case 0:
        
        switch (**cmd) {
                case 0:
@@ -566,59 +555,55 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
                case 's':
                case 'S':
                        // you must have selected the tag earlier
                case 's':
                case 'S':
                        // you must have selected the tag earlier
-                       req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                      ISO15_REQ_NONINVENTORY | ISO15_REQ_SELECT;
-                  memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
-                       reqlen+=iso15cmdlen;               
+                       req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_SELECT;
+                       memcpy(&req[reqlen], &iso15cmd[0], iso15cmdlen);
+                       reqlen += iso15cmdlen;             
                   break;
                case 'u':
                case 'U':
                        // unaddressed mode may not be supported by all vendors
                   break;
                case 'u':
                case 'U':
                        // unaddressed mode may not be supported by all vendors
-                       req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                      ISO15_REQ_NONINVENTORY;
-                  memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
-                       reqlen+=iso15cmdlen;               
+                       req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH;
+                       memcpy(&req[reqlen], &iso15cmd[0], iso15cmdlen);
+                       reqlen += iso15cmdlen;             
                   break;
                case '*':
                        // we scan for the UID ourself
                   break;
                case '*':
                        // we scan for the UID ourself
-                       req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                      ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-                  memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
-                       reqlen+=iso15cmdlen;               
-                  if (!getUID(uid)) {
-                       PrintAndLog("No Tag found");
-                       return 0;
-                  }
-                  memcpy(req+reqlen,uid,8);
-                  PrintAndLog("Detected UID %s",sprintUID(NULL,uid));
-                  reqlen+=8;
+                       req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
+                       memcpy(&req[reqlen], &iso15cmd[0], iso15cmdlen);
+                       reqlen += iso15cmdlen;             
+                       if (!getUID(uid)) {
+                               PrintAndLog("No Tag found");
+                               return 0;
+                       }
+                       memcpy(req+reqlen ,uid, 8);
+                       PrintAndLog("Detected UID %s",sprintUID(NULL,uid));
+                       reqlen += 8;
                        break;                  
                default:
                        break;                  
                default:
-                       req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | 
-                      ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-                       memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
-                       reqlen+=iso15cmdlen;               
+                       req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
+                       memcpy(&req[reqlen], &iso15cmd[0], iso15cmdlen);
+                       reqlen += iso15cmdlen;             
                   
 /*                     sscanf(cmd,"%hX%hX%hX%hX%hX%hX%hX%hX",
                                (short unsigned int *)&uid[7],(short unsigned int *)&uid[6],
                                (short unsigned int *)&uid[5],(short unsigned int *)&uid[4],
                                (short unsigned int *)&uid[3],(short unsigned int *)&uid[2],
                                (short unsigned int *)&uid[1],(short unsigned int *)&uid[0]); */
                   
 /*                     sscanf(cmd,"%hX%hX%hX%hX%hX%hX%hX%hX",
                                (short unsigned int *)&uid[7],(short unsigned int *)&uid[6],
                                (short unsigned int *)&uid[5],(short unsigned int *)&uid[4],
                                (short unsigned int *)&uid[3],(short unsigned int *)&uid[2],
                                (short unsigned int *)&uid[1],(short unsigned int *)&uid[0]); */
-                       for (int i=0;i<8 && (*cmd)[i*2] && (*cmd)[i*2+1];i++) { // parse UID
+                       for (int i=0; i<8 && (*cmd)[i*2] && (*cmd)[i*2+1]; i++) { // parse UID
                                sscanf((char[]){(*cmd)[i*2],(*cmd)[i*2+1],0},"%X",&temp);
                                uid[7-i]=temp&0xff;
                        }                               
                                
                                sscanf((char[]){(*cmd)[i*2],(*cmd)[i*2+1],0},"%X",&temp);
                                uid[7-i]=temp&0xff;
                        }                               
                                
-                       PrintAndLog("Using UID %s",sprintUID(NULL,uid));
-                       memcpy(&req[reqlen],&uid[0],8);            
-                  reqlen+=8;
+                       PrintAndLog("Using UID %s", sprintUID(NULL, uid));
+                       memcpy(&req[reqlen], &uid[0], 8);                  
+                       reqlen += 8;
        }
        // skip to next space           
        }
        // skip to next space           
-       while (**cmd!=' ' && **cmd!='\t') (*cmd)++;
+       while (**cmd != ' ' && **cmd != '\t') (*cmd)++;
        // skip over the space
        // skip over the space
-       while (**cmd==' ' || **cmd=='\t') (*cmd)++;
+       while (**cmd == ' ' || **cmd == '\t') (*cmd)++;
        
        
-       c->arg[0]=reqlen;       
+       c->arg[0] = reqlen;     
        return 1;
 }
 
        return 1;
 }
 
@@ -626,7 +611,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
  * Commandline handling: HF15 CMD SYSINFO
  * get system information from tag/VICC
  */
  * Commandline handling: HF15 CMD SYSINFO
  * get system information from tag/VICC
  */
-int CmdHF15CmdSysinfo(const char *Cmd) {
+static 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?
@@ -654,7 +639,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
                return 0;
        }       
        
                return 0;
        }       
        
-       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);      
+       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_GET_SYSTEM_INFO},1);       
        reqlen=c.arg[0];
        
        reqlen=AddCrc(req,reqlen);
        reqlen=c.arg[0];
        
        reqlen=AddCrc(req,reqlen);
@@ -662,20 +647,14 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
 
        SendCommand(&c);
 
 
        SendCommand(&c);
 
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000) && resp.arg[0] > 2) {
                recv = resp.d.asBytes;
                recv = resp.d.asBytes;
-               if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
-                       if (!(recv[0] & ISO15_RES_ERROR)) {
+               if (ISO15693_CRC_CHECK == Crc(recv, resp.arg[0])) {
+                       if (!(recv[0] & ISO15693_RES_ERROR)) {
                                *output=0; // reset outputstring
                                *output=0; // reset outputstring
-                               for ( i=1; i<resp.arg[0]-2; i++) {
-                                       sprintf(output+strlen(output),"%02X ",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");
+                               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]));
                                i=10;
                                if (recv[1] & 0x01) 
                                        sprintf(output+strlen(output),"DSFID supported, set to %02X\n\r",recv[i++]);
                                i=10;
                                if (recv[1] & 0x01) 
                                        sprintf(output+strlen(output),"DSFID supported, set to %02X\n\r",recv[i++]);
@@ -710,11 +689,12 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 
+
 /**
  * Commandline handling: HF15 CMD READMULTI
  * Read multiple blocks at once (not all tags support this)
  */
 /**
  * Commandline handling: HF15 CMD READMULTI
  * Read multiple blocks at once (not all tags support this)
  */
-int CmdHF15CmdReadmulti(const char *Cmd) {
+static int CmdHF15CmdReadmulti(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?
@@ -741,7 +721,7 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
                return 0;
        }       
        
                return 0;
        }       
        
-       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_READMULTI},1);    
+       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_READ_MULTI_BLOCK},1);      
        reqlen=c.arg[0];
 
        pagenum=strtol(cmd,NULL,0);
        reqlen=c.arg[0];
 
        pagenum=strtol(cmd,NULL,0);
@@ -765,8 +745,8 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
 
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
                recv = resp.d.asBytes;
 
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
                recv = resp.d.asBytes;
-               if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
-                       if (!(recv[0] & ISO15_RES_ERROR)) {
+               if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
+                       if (!(recv[0] & ISO15693_RES_ERROR)) {
                                *output=0; // reset outputstring
                                for ( int i=1; i<resp.arg[0]-2; i++) {
                                        sprintf(output+strlen(output),"%02X ",recv[i]);
                                *output=0; // reset outputstring
                                for ( int i=1; i<resp.arg[0]-2; i++) {
                                        sprintf(output+strlen(output),"%02X ",recv[i]);
@@ -789,11 +769,12 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 
+
 /**
  * Commandline handling: HF15 CMD READ
  * Reads a single Block
  */
 /**
  * Commandline handling: HF15 CMD READ
  * Reads a single Block
  */
-int CmdHF15CmdRead(const char *Cmd) {
+static int CmdHF15CmdRead(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?
@@ -819,7 +800,7 @@ int CmdHF15CmdRead(const char *Cmd) {
                return 0;
        }       
        
                return 0;
        }       
        
-       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_READ},1); 
+       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_READBLOCK},1);     
        reqlen=c.arg[0];
 
        pagenum=strtol(cmd,NULL,0);
        reqlen=c.arg[0];
 
        pagenum=strtol(cmd,NULL,0);
@@ -838,8 +819,8 @@ int CmdHF15CmdRead(const char *Cmd) {
 
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
                recv = resp.d.asBytes;
 
        if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
                recv = resp.d.asBytes;
-               if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
-                       if (!(recv[0] & ISO15_RES_ERROR)) {
+               if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
+                       if (!(recv[0] & ISO15693_RES_ERROR)) {
                                *output=0; // reset outputstring
                                //sprintf(output, "Block %2i   ",blocknum);
                                for ( int i=1; i<resp.arg[0]-2; i++) {
                                *output=0; // reset outputstring
                                //sprintf(output, "Block %2i   ",blocknum);
                                for ( int i=1; i<resp.arg[0]-2; i++) {
@@ -866,22 +847,21 @@ int CmdHF15CmdRead(const char *Cmd) {
 
 /**
  * Commandline handling: HF15 CMD WRITE
 
 /**
  * Commandline handling: HF15 CMD WRITE
- * Writes a single Block - might run into timeout, even when successful
- */
-int CmdHF15CmdWrite(const char *Cmd) {
+ * Writes a single Block
+**/
+static int CmdHF15CmdWrite(const char *Cmd) {
        UsbCommand resp;
        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, pagenum, temp;
+       UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len, speed, recv
+       uint8_t *req = c.d.asBytes;
+       int reqlen = 0, pagenum, temp;
        char cmdbuf[100];
        char cmdbuf[100];
-       char *cmd=cmdbuf;
+       char *cmd = cmdbuf;
        char *cmd2;
        
        char *cmd2;
        
-       strncpy(cmd,Cmd,99);
+       strncpy(cmd, Cmd, 99);
 
        // usage:
 
        // usage:
-       if (strlen(cmd)<3) {
+       if (strlen(cmd) < 3) {
                PrintAndLog("Usage:  hf 15 cmd write    [options] <uid|s|u|*> <page#> <hexdata>");
                PrintAndLog("           options:");
                PrintAndLog("               -2        use slower '1 out of 256' mode");
                PrintAndLog("Usage:  hf 15 cmd write    [options] <uid|s|u|*> <page#> <hexdata>");
                PrintAndLog("           options:");
                PrintAndLog("               -2        use slower '1 out of 256' mode");
@@ -896,84 +876,207 @@ int CmdHF15CmdWrite(const char *Cmd) {
                return 0;
        }       
        
                return 0;
        }       
        
-       prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_WRITE},1);        
-       reqlen=c.arg[0];
+       prepareHF15Cmd(&cmd, &c, (uint8_t[]){ISO15693_WRITEBLOCK}, 1);  
+       reqlen = c.arg[0];
        
        // *cmd -> page num ; *cmd2 -> data 
        
        // *cmd -> page num ; *cmd2 -> data 
-       cmd2=cmd;
-       while (*cmd2!=' ' && *cmd2!='\t' && *cmd2) cmd2++;
-       *cmd2=0;
+       cmd2 = cmd;
+       while (*cmd2 != ' ' && *cmd2 != '\t' && *cmd2) cmd2++;
+       *cmd2 = 0;
        cmd2++; 
                
        cmd2++; 
                
-       pagenum=strtol(cmd,NULL,0);
+       pagenum = strtol(cmd, NULL, 0);
        /*if (pagenum<0) {
                PrintAndLog("invalid pagenum");
                return 0;
        }       */      
        /*if (pagenum<0) {
                PrintAndLog("invalid pagenum");
                return 0;
        }       */      
-       req[reqlen++]=(uint8_t)pagenum;
+       req[reqlen++] = (uint8_t)pagenum;
        
        
        while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars 
        
        
        while (cmd2[0] && cmd2[1]) { // hexdata, read by 2 hexchars 
-               if (*cmd2==' ') {
+               if (*cmd2 == ' ') {
                        cmd2++; 
                        continue; 
                }
                        cmd2++; 
                        continue; 
                }
-               sscanf((char[]){cmd2[0],cmd2[1],0},"%X",&temp);
-               req[reqlen++]=temp & 0xff;
-               cmd2+=2;
+               sscanf((char[]){cmd2[0], cmd2[1], 0}, "%X", &temp);
+               req[reqlen++] = temp & 0xff;
+               cmd2 += 2;
        } 
        
        } 
        
-       reqlen=AddCrc(req,reqlen);
-       
-       c.arg[0]=reqlen;
+       reqlen = AddCrc(req, reqlen);
+       c.arg[0] = reqlen;
 
        SendCommand(&c);
 
 
        SendCommand(&c);
 
-       if (WaitForResponseTimeout(CMD_ACK,&resp,2000) && resp.arg[0]>2) {
-               recv = resp.d.asBytes;
-               if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
-                       if (!(recv[0] & ISO15_RES_ERROR)) {                                     
-                               PrintAndLog("OK");      
-                       } else {
-                               PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-                       }                  
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+               int recv_len = resp.arg[0];
+               uint8_t *recv = resp.d.asBytes;
+               if (recv_len == 0) {
+                       PrintAndLog("Received SOF only. Maybe Picopass/iCLASS?");
+               } else if (recv_len == -1) {
+                       PrintAndLog("Tag didn't respond");
+               } else if (recv_len == -2) {
+                       PrintAndLog("Receive buffer overflow");
+               } else if (ISO15693_CRC_CHECK != Crc(recv, resp.arg[0])) {
+                       PrintAndLog("CRC check failed on Tag response");
+               } else if (!(recv[0] & ISO15693_RES_ERROR)) {
+                       PrintAndLog("Tag returned OK"); 
                } else {
                } else {
-                       PrintAndLog("CRC failed");
+                       PrintAndLog("Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1])); 
+               }
+       } else {
+               PrintAndLog("No answer from Proxmark");
+       }
+       
+       return 0;
+}
+
+
+static int CmdHF15CSetUID(const char *Cmd) {
+       uint8_t uid[8] = {0x00};
+       uint8_t oldUid[8], newUid[8] = {0x00};
+       
+       uint8_t needHelp = 0;
+       char cmdp = 1;
+       
+       if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 16)) {   
+               PrintAndLog("UID must include 16 HEX symbols");
+               return 1;
+       }
+       
+       if (uid[0] != 0xe0) {
+               PrintAndLog("UID must begin with the byte 'E0'");
+               return 1;
+       }
+       
+       while (param_getchar(Cmd, cmdp) != 0x00) {
+               switch (param_getchar(Cmd, cmdp)) {
+                       case 'h':
+                       case 'H':
+                               needHelp = 1;
+                               break;
+                       default:
+                               PrintAndLog("ERROR: Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               needHelp = 1;
+                       break;
+               }
+               cmdp++;
+       }
+       
+       if (strlen(Cmd) < 1 || needHelp) {
+               PrintAndLog("");
+               PrintAndLog("Usage:  hf 15 csetuid <UID 16 hex symbols>");
+               PrintAndLog("sample:  hf 15 csetuid E004013344556677");
+               PrintAndLog("Set UID for magic Chinese card (only works with such cards)");
+               return 0;
+       }
+       
+       PrintAndLog("Using backdoor Magic tag function");
+       
+       if (!getUID(oldUid)) {
+               PrintAndLog("Can't get old UID.");
+               return 1;
+       }
+       
+       UsbCommand c = {CMD_CSETUID_ISO_15693, {0, 0, 0}};
+       memcpy(c.d.asBytes, uid, 8);
+               
+       SendCommand(&c);
+       
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+               int recv_len = resp.arg[0];
+               uint8_t *recv = resp.d.asBytes;
+               if (recv_len == 0) {
+                       PrintAndLog("Received SOF only. Maybe Picopass/iCLASS?");
+               } else if (recv_len == -1) {
+                       PrintAndLog("Tag didn't respond");
+               } else if (recv_len == -2) {
+                       PrintAndLog("Receive buffer overflow");
+               } else if (ISO15693_CRC_CHECK != Crc(recv, recv_len)) {
+                       PrintAndLog("CRC check failed on Tag response");
+               } else if (!(recv[0] & ISO15693_RES_ERROR)) {
+                       PrintAndLog("Tag returned OK"); 
+               } else {
+                       PrintAndLog("Tag returned Error %i: %s", recv[1], TagErrorStr(recv[1])); 
                }
        } else {
                }
        } else {
-               PrintAndLog("timeout: no answer - data may be written anyway");
+               PrintAndLog("No answer from Proxmark");
        }
        
        }
        
+       if (!getUID(newUid)) {
+               PrintAndLog("Can't get new UID.");
+               return 1;
+       }
+       
+       PrintAndLog("");
+       PrintAndLog("old UID : %02X %02X %02X %02X %02X %02X %02X %02X", oldUid[7], oldUid[6], oldUid[5], oldUid[4], oldUid[3], oldUid[2], oldUid[1], oldUid[0]);
+       PrintAndLog("new UID : %02X %02X %02X %02X %02X %02X %02X %02X", newUid[7], newUid[6], newUid[5], newUid[4], newUid[3], newUid[2], newUid[1], newUid[0]);
        return 0;
 }
 
 
        return 0;
 }
 
 
+// "HF 15 Cmd" Interface
+// Allows direct communication with the tag on command level
+
+static int CmdHF15CmdHelp(const char*Cmd);
 
 
-static command_t CommandTable15Cmd[] =
-{
-       {"help",    CmdHF15CmdHelp,    1, "This Help"},
-       {"inquiry", CmdHF15CmdInquiry, 0, "Search for tags in range"},
+static command_t CommandTable15Cmd[] = {
+       {"help",      CmdHF15CmdHelp,      1, "This Help"},
+       {"inquiry",   CmdHF15CmdInquiry,   0, "Search for tags in range"},
  /*    
  /*    
-       {"select",  CmdHF15CmdSelect, 0, "Select an tag with a specific UID for further commands"},
+       {"select",    CmdHF15CmdSelect,    0, "Select an tag with a specific UID for further commands"},
  */
  */
-       {"read",    CmdHF15CmdRead,    0, "Read a block"},      
-       {"write",   CmdHF15CmdWrite,    0, "Write a block"},    
-       {"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}
+       {"read",      CmdHF15CmdRead,      0, "Read a block"},  
+       {"write",     CmdHF15CmdWrite,     0, "Write a block"}, 
+       {"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}
 };
 
 };
 
-int CmdHF15Cmd(const char *Cmd)
-{
+
+static int CmdHF15Cmd(const char *Cmd) {
        CmdsParse(CommandTable15Cmd, Cmd);
        return 0;
 }
        CmdsParse(CommandTable15Cmd, Cmd);
        return 0;
 }
-       
-int CmdHF15CmdHelp(const char *Cmd)
-{
+
+
+static int CmdHF15CmdHelp(const char *Cmd) {
        CmdsHelp(CommandTable15Cmd);
        return 0;
 }
 
        CmdsHelp(CommandTable15Cmd);
        return 0;
 }
 
+
+// "HF 15" interface
+
+static int CmdHF15Help(const char*Cmd);
+
+static command_t CommandTable15[] = {
+       {"help",       CmdHF15Help,    1, "This help"},
+       {"demod",      CmdHF15Demod,   1, "Demodulate ISO15693 from tag"},
+       {"read",       CmdHF15Read,    0, "Read HF tag (ISO 15693)"},
+       {"snoop",      CmdHF15Snoop,   0, "Eavesdrop ISO 15693 communications"},
+       {"reader",     CmdHF15Reader,  0, "Act like an ISO15693 reader"},
+       {"sim",        CmdHF15Sim,     0, "Fake 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"},
+       {"csetuid",        CmdHF15CSetUID, 0, "Set UID for magic Chinese card"},
+       {NULL,         NULL,           0, NULL}
+};
+
+
+int CmdHF15(const char *Cmd) {
+       CmdsParse(CommandTable15, Cmd);
+       return 0;
+}
+
+
+static int CmdHF15Help(const char *Cmd) {
+       CmdsHelp(CommandTable15);
+       return 0;
+}
+
+
Proxmark3 GIT tracking
Impressum, Datenschutz