CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to...

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index d544a91cca73d5ca9060075b7705b952fb0cf358..60c2e858bb21ee84c5010a2da0f135843f0aedfd 100644 (file)
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -13,82 +13,72 @@ static int CmdHelp(const char *Cmd);
 
 #define MAX_LENGTH 1024        
 
 
 #define MAX_LENGTH 1024        
 

-int usage_legic_calccrc8(void){
-       PrintAndLog("Calculates the legic crc8/crc16 on the input hexbytes.");
+int usage_legic_calccrc(void){
+       PrintAndLog("Calculates the legic crc8/crc16 on the given data.");

        PrintAndLog("There must be an even number of hexsymbols as input.");
        PrintAndLog("There must be an even number of hexsymbols as input.");

-       PrintAndLog("Usage:  hf legic crc8 [h] b <hexbytes> u <uidcrc> c <crc type>");
+       PrintAndLog("Usage:  hf legic crc [h] d <data> u <uidcrc> c <8|16>");

        PrintAndLog("Options:");
        PrintAndLog("      h             : this help");
        PrintAndLog("Options:");
        PrintAndLog("      h             : this help");

-       PrintAndLog("      b <hexbytes>  : hex bytes");
+       PrintAndLog("      d <data>      : (hex symbols) bytes to calculate crc over");

        PrintAndLog("      u <uidcrc>    : MCC hexbyte");
        PrintAndLog("      u <uidcrc>    : MCC hexbyte");

-       PrintAndLog("      c <crc type>  : 8|16 bit crc size");
+       PrintAndLog("      c <8|16>      : Crc type");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic crc8 b deadbeef1122");
-       PrintAndLog("      hf legic crc8 b deadbeef1122 u 9A c 16");
-       return 0;
-}
-int usage_legic_load(void){
-       PrintAndLog("It loads datasamples from the file `filename` to device memory");
-       PrintAndLog("Usage:  hf legic load [h] <file name>");
-       PrintAndLog("Options:");
-       PrintAndLog("  h             : this help");
-       PrintAndLog("  <filename>    : Name of file to load");
-       PrintAndLog("");
-       PrintAndLog("Samples:");
-       PrintAndLog("      hf legic load filename");
+       PrintAndLog("      hf legic crc b deadbeef1122");
+       PrintAndLog("      hf legic crc b deadbeef1122 u 9A c 16");

        return 0;
 }
 int usage_legic_rdmem(void){   
        PrintAndLog("Read data from a legic tag.");
        PrintAndLog("Usage:  hf legic rdmem [h] <offset> <length> <IV>");
        PrintAndLog("Options:");
        return 0;
 }
 int usage_legic_rdmem(void){   
        PrintAndLog("Read data from a legic tag.");
        PrintAndLog("Usage:  hf legic rdmem [h] <offset> <length> <IV>");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  <offset>      : offset in data array to start download from (hex)");
-       PrintAndLog("  <length>      : number of bytes to read (hex)");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use (hex, odd and 7bits)");
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      <offset>      : (hex) offset in data array to start download from");
+       PrintAndLog("      <length>      : (hex) number of bytes to read");
+       PrintAndLog("      <IV>          : (hex) (optional) Initialization vector to use. Must be odd and 7bits max");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic rdmem 0 21        - reads from byte[0] 21 bytes(system header)");
-       PrintAndLog("      hf legic rdmem 0 4 55      - reads from byte[0] 4 bytes with IV 0x55");
-       PrintAndLog("      hf legic rdmem 0 100 55    - reads 256bytes with IV 0x55");
+       PrintAndLog("      hf legic rdmem 0 16        - reads from byte[0] 0x16 bytes(system header)");
+       PrintAndLog("      hf legic rdmem 0 4 55      - reads from byte[0] 0x4 bytes with IV 0x55");
+       PrintAndLog("      hf legic rdmem 0 100 55    - reads 0x100 bytes with IV 0x55");

        return 0;
 }
 int usage_legic_sim(void){
        return 0;
 }
 int usage_legic_sim(void){

-       PrintAndLog("Missing help text.");
-       return 0;
-}
-int usage_legic_write(void){
-       PrintAndLog(" Write sample buffer to a legic tag. (use after load or read)");
-       PrintAndLog("Usage:  hf legic write [h] <offset> <length> <IV>");
+       PrintAndLog("Simulates a LEGIC Prime tag. MIM22, MIM256, MIM1024 types can be emulated");
+       PrintAndLog("Use eload/esave to upload a dump into emulator memory");
+       PrintAndLog("Usage:  hf legic sim [h] <tagtype> <phase> <frame> <reqresp>");

        PrintAndLog("Options:");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  <offset>      : offset in data array to start writing from (hex)");
-       PrintAndLog("  <length>      : number of bytes to write (hex)");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      <tagtype>     : 0 = MIM22");
+       PrintAndLog("                    : 1 = MIM256 (default)");
+       PrintAndLog("                    : 2 = MIM1024");       
+       PrintAndLog("      <phase>       : phase drift");
+       PrintAndLog("      <frame>       : frame drift");
+       PrintAndLog("      <reqresp>     : reqresp drift");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic write 10 4      - writes 0x4 to byte[0x10]");
+       PrintAndLog("      hf legic sim");
+       PrintAndLog("      hf legic sim ");

        return 0;
 }
        return 0;
 }

-int usage_legic_rawwrite(void){
-       PrintAndLog("Write raw data direct to a specific offset on legic tag.");
-       PrintAndLog("Usage:  hf legic writeraw [h] <offset> <value> <IV>");
+int usage_legic_write(void){
+       PrintAndLog("Write data to a LEGIC Prime tag. It autodetects tagsize to make sure size");
+       PrintAndLog("Usage:  hf legic write [h] o <offset> d <data (hex symbols)>");

        PrintAndLog("Options:");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  <offset>      : offset to write to (hex)");
-       PrintAndLog("  <value>       : value (hex)");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use (hex, odd and 7bits)");
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      o <offset>    : (hex) offset in data array to start writing");
+       //PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
+       PrintAndLog("      d <data>      : (hex symbols) bytes to write ");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic writeraw 10 4    - writes 0x4 to byte[0x10]");
+       PrintAndLog("      hf legic write o 10 d 11223344    - Write 0x11223344 starting from offset 0x10");

        return 0;
 }
 int usage_legic_reader(void){
        PrintAndLog("Read UID and type information from a legic tag.");
        PrintAndLog("Usage:  hf legic reader [h]");
        PrintAndLog("Options:");
        return 0;
 }
 int usage_legic_reader(void){
        PrintAndLog("Read UID and type information from a legic tag.");
        PrintAndLog("Usage:  hf legic reader [h]");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
+       PrintAndLog("      h             : this help");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic reader");
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic reader");


@@ -99,60 +89,67 @@ int usage_legic_info(void){
        PrintAndLog("Shows systemarea, user areas etc");
        PrintAndLog("Usage:  hf legic info [h]");
        PrintAndLog("Options:");
        PrintAndLog("Shows systemarea, user areas etc");
        PrintAndLog("Usage:  hf legic info [h]");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
+       PrintAndLog("      h             : this help");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic info");
        return 0;
 }
 int usage_legic_dump(void){
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic info");
        return 0;
 }
 int usage_legic_dump(void){

-       PrintAndLog("Reads all pages from LEGIC MIM22, MIM256, MIM1024");
+       PrintAndLog("Reads all pages from LEGIC Prime MIM22, MIM256, MIM1024");

        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
        PrintAndLog("Usage:  hf legic dump [h] o <filename w/o .bin>");
        PrintAndLog("Options:");
        PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
        PrintAndLog("It autodetects card type.\n");     
        PrintAndLog("Usage:  hf legic dump [h] o <filename w/o .bin>");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  n <FN>  : filename w/o .bin to save the dump as");       
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      o <filename>  : filename w/o '.bin' to dump bytes");

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic dump");
        PrintAndLog("      hf legic dump o myfile");
        return 0;
 }
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic dump");
        PrintAndLog("      hf legic dump o myfile");
        return 0;
 }

-
+int usage_legic_restore(void){
+       PrintAndLog("Reads binary file and it autodetects card type and verifies that the file has the same size");
+       PrintAndLog("Then write the data back to card. All bytes except the first 7bytes [UID(4) MCC(1) DCF(2)]\n");
+       PrintAndLog("Usage:   hf legic restore [h] i <filename w/o .bin>");
+       PrintAndLog("Options:");
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      i <filename>  : filename w/o '.bin' to restore bytes on to card from");
+       PrintAndLog("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic restore i myfile");
+       return 0;
+}

 int usage_legic_eload(void){
        PrintAndLog("It loads binary dump from the file `filename.bin`");
        PrintAndLog("Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
        PrintAndLog("Options:");
 int usage_legic_eload(void){
        PrintAndLog("It loads binary dump from the file `filename.bin`");
        PrintAndLog("Usage:  hf legic eload [h] [card memory] <file name w/o `.bin`>");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  [card memory] : 0 = MIM22");
-       PrintAndLog("                : 1 = MIM256 (default)");
-       PrintAndLog("                : 2 = MIM1024");
-       PrintAndLog("  <filename>    : filename w/o .bin to load");     
+       PrintAndLog("      h             : this help"); 
+       PrintAndLog("      [card memory] : 0 = MIM22");
+       PrintAndLog("                    : 1 = MIM256 (default)");
+       PrintAndLog("                    : 2 = MIM1024");
+       PrintAndLog("      <filename>    : filename w/o .bin to load"); 

        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic eload filename");
-       PrintAndLog("      hf legic eload 2 filename");
+       PrintAndLog("      hf legic eload 2 myfile");

        return 0;
 }
 int usage_legic_esave(void){
        PrintAndLog("It saves binary dump into the file `filename.bin` or `cardID.bin`");
        PrintAndLog(" Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
        PrintAndLog("Options:");
        return 0;
 }
 int usage_legic_esave(void){
        PrintAndLog("It saves binary dump into the file `filename.bin` or `cardID.bin`");
        PrintAndLog(" Usage:  hf legic esave [h] [card memory] [file name w/o `.bin`]");
        PrintAndLog("Options:");

-       PrintAndLog("  h             : this help");
-       PrintAndLog("  [card memory] : 0 = MIM22");
-       PrintAndLog("                : 1 = MIM256 (default)");
-       PrintAndLog("                : 2 = MIM1024");
-       PrintAndLog("  <filename>    : filename w/o .bin to load");     
+       PrintAndLog("      h             : this help");
+       PrintAndLog("      [card memory] : 0 = MIM22");
+       PrintAndLog("                    : 1 = MIM256 (default)");
+       PrintAndLog("                    : 2 = MIM1024");
+       PrintAndLog("      <filename>    : filename w/o .bin to load"); 

        PrintAndLog("");
        PrintAndLog("Samples:");        
        PrintAndLog("");
        PrintAndLog("Samples:");        

-       PrintAndLog("      hf legic esave ");
-       PrintAndLog("      hf legic esave 2");
-       PrintAndLog("      hf legic esave 2 filename");
+       PrintAndLog("      hf legic esave 2 myfile");

        return 0;
 }
 
        return 0;
 }
 

-

 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held
 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held


@@ -209,7 +206,7 @@ int CmdLegicInfo(const char *Cmd) {
                        data[6]
                );
        
                        data[6]
                );
        

-       } else if(dcf > 60000) {                // Master token?
+       } else if (dcf > 60000) {               // Master token?

 
                int fl = 0;
 
 
                int fl = 0;
 


@@ -447,21 +444,31 @@ int CmdLegicInfo(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 

+// params:
+// offset in data memory
+// number of bytes to read

 int CmdLegicRdmem(const char *Cmd) {
 
 int CmdLegicRdmem(const char *Cmd) {
 

-       // params:
-       // offset in data memory
-       // number of bytes to read

        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rdmem();
        
        uint32_t offset = 0, len = 0, IV = 1;
        sscanf(Cmd, "%x %x %x", &offset, &len, &IV);
 
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rdmem();
        
        uint32_t offset = 0, len = 0, IV = 1;
        sscanf(Cmd, "%x %x %x", &offset, &len, &IV);
 

+       // tagtype
+       legic_card_select_t card;
+       if (legic_get_type(&card)) {
+               PrintAndLog("Failed to identify tagtype");
+               return 1;
+       }
+
+       legic_print_type(card.cardsize, 0);
+

        // OUT-OF-BOUNDS check
        // OUT-OF-BOUNDS check

-       if ( len + offset > MAX_LENGTH ) {
-               len = MAX_LENGTH - offset;
-               PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len);
+       // UID 4 bytes can't be written to.
+       if ( len + offset >= card.cardsize ) {
+               len = card.cardsize - offset;
+               PrintAndLog("Out-of-bounds, Cardsize = %d, Trunc offset+len = %d", card.cardsize, len + offset);

        }
        
        legic_chk_iv(&IV);
        }
        
        legic_chk_iv(&IV);


@@ -470,181 +477,45 @@ int CmdLegicRdmem(const char *Cmd) {
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;

-       if (WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {
-               uint8_t isOK = resp.arg[0] & 0xFF;
-               uint16_t readlen = resp.arg[1];
-                if ( isOK ) {
-
-                       uint8_t *data = malloc(readlen);
-                       if ( !data ){
-                               PrintAndLog("Cannot allocate memory");
-                               return 2;
-                       }
-                       
-                       if ( readlen != len )
-                               PrintAndLog("Fail, only managed to read 0x%02X bytes", readlen);
-                       
-                       // copy data from device
-                       GetEMLFromBigBuf(data, readlen, 0);
-                       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)){
-                               PrintAndLog("Command execute timeout");
-                               if ( data ) 
-                                       free(data);
-                               return 1;
-                       }
-       
-                       PrintAndLog("\n ##  | Data");
-                       PrintAndLog("-----+-----");
-                       print_hex_break( data, readlen, 32);
-                } else {
-                        PrintAndLog("failed reading tag");
-                }
-       } else {
+       if ( !WaitForResponseTimeout(CMD_ACK, &resp, 3000) ) {

                PrintAndLog("command execution time out");
                return 1;
        }
                PrintAndLog("command execution time out");
                return 1;
        }

-       return 0;
-}

 
 

-// load, filename  (ascii hex textfile)
-// uploads it to device mem
-int CmdLegicLoad(const char *Cmd) {
-
-// iceman: potential bug, where all filepaths or filename which starts with H or h will print the helptext :)  
-       char cmdp = param_getchar(Cmd, 0);
-       if ( cmdp == 'H' || cmdp == 'h' || cmdp == 0x00) return usage_legic_load();
-
-       char filename[FILE_PATH_SIZE] = {0x00};
-       int len = strlen(Cmd);
-       
-       if (len > FILE_PATH_SIZE) {
-               PrintAndLog("Filepath too long (was %s bytes), max allowed is %s ", len, FILE_PATH_SIZE);
-               return 0;
+       uint8_t isOK = resp.arg[0] & 0xFF;
+       uint16_t readlen = resp.arg[1];
+       if ( !isOK ) {
+               PrintAndLog("failed reading tag");
+               return 2;

        }
        }

-       memcpy(filename, Cmd, len);
-
-    FILE *f = fopen(filename, "r");
-    if(!f) {
-        PrintAndLog("couldn't open '%s'", Cmd);
-        return -1;
-    }

        
        

-    char line[80]; 
-       int offset = 0; 
-       uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
-       int index = 0;
-       int totalbytes = 0;
-    while ( fgets(line, sizeof(line), f) ) {
-        int res = sscanf(line, "%x %x %x %x %x %x %x %x", 
-            (unsigned int *)&data[index],
-                       (unsigned int *)&data[index + 1],
-                       (unsigned int *)&data[index + 2],
-                       (unsigned int *)&data[index + 3],
-            (unsigned int *)&data[index + 4],
-                       (unsigned int *)&data[index + 5],
-                       (unsigned int *)&data[index + 6],
-                       (unsigned int *)&data[index + 7]);
+       uint8_t *data = malloc(readlen);
+       if ( !data ){
+               PrintAndLog("Cannot allocate memory");
+               return 2;
+       }

                        
                        

-        if(res != 8) {
-          PrintAndLog("Error: could not read samples");
-          fclose(f);
-          return -1;
-        }
-               index += res;
+       if ( readlen != len )
+               PrintAndLog("Fail, only managed to read 0x%02X bytes", readlen);

                        
                        

-               if ( index == USB_CMD_DATA_SIZE ){
-//                     PrintAndLog("sent %d | %d | %d", index, offset, totalbytes);
-                       UsbCommand c = { CMD_DOWNLOADED_SIM_SAMPLES_125K, {offset, 0, 0}};
-                       memcpy(c.d.asBytes, data, sizeof(data));
-                       clearCommandBuffer();
-                       SendCommand(&c);
-                       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 1500)){
-                               PrintAndLog("Command execute timeout");
-                               fclose(f);
-                               return 1;
-                       }
-                       offset += index;
-                       totalbytes += index;
-                       index = 0;
-               }
-    }
-    fclose(f);
-       
-       // left over bytes?
-       if ( index != 0 ) {
-               UsbCommand c = { CMD_DOWNLOADED_SIM_SAMPLES_125K, {offset, 0, 0}};
-               memcpy(c.d.asBytes, data, 8);
-               clearCommandBuffer();
-               SendCommand(&c);
-               if ( !WaitForResponseTimeout(CMD_ACK, NULL, 1500)){
-                               PrintAndLog("Command execute timeout");
-                               return 1;
-               }
-               totalbytes += index;            
-       }
-       
-    PrintAndLog("loaded %u samples", totalbytes);
-    return 0;
-}
-
-// Save,  filename, num of bytes, starting offset. (in decimal)
-//  ie:  "hf legic save nnn.txt 100 0  (saves the first 100bytes)
-// (ascii hex textfile)
-int CmdLegicSave(const char *Cmd) {
-       int requested = 1024;
-       int offset = 0;
-       int delivered = 0;
-       char filename[FILE_PATH_SIZE] = {0x00};
-       uint8_t got[1024] = {0x00};
-
-       memset(filename, 0, FILE_PATH_SIZE);
-       
-       sscanf(Cmd, " %s %i %i", filename, &requested, &offset);
-
-       /* If no length given save entire legic read buffer */
-       /* round up to nearest 8 bytes so the saved data can be used with legicload */
-       if (requested == 0)
-               requested = 1024;
-
-       if (requested % 8 != 0) {
-               int remainder = requested % 8;
-               requested = requested + 8 - remainder;
-       }
-
-       if (offset + requested > sizeof(got)) {
-               PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > 1024");
-               return 0;
-       }
-
-       GetFromBigBuf(got, requested, offset);
-       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
-               PrintAndLog("Command execute timeout"); 
+       // copy data from device
+       GetEMLFromBigBuf(data, readlen, 0);
+       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)){
+               PrintAndLog("Command execute timeout");
+               free(data);

                return 1;
        }
                return 1;
        }

-
-       FILE *f = fopen(filename, "w");
-       if(!f) {
-               PrintAndLog("couldn't open '%s'", Cmd+1);
-               return -1;
-       }

        
        

-       for (int j = 0; j < requested; j += 8) {
-               fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-                       got[j+0], got[j+1], got[j+2], got[j+3],
-                       got[j+4], got[j+5],     got[j+6], got[j+7]
-               );
-               delivered += 8;
-               if (delivered >= requested) break;
-       }
-
-       fclose(f);
-       PrintAndLog("saved %u samples", delivered);
+       PrintAndLog("\n ##  | Data");
+       PrintAndLog("-----+-----");
+       print_hex_break( data, readlen, 32);
+       free(data);

        return 0;
 }
 
        return 0;
 }
 

-//TODO: write a help text (iceman)

 // should say which tagtype
 // should load a tag to device mem.
 // should say which tagtype
 // should load a tag to device mem.

+// int phase, int frame, int reqresp

 int CmdLegicRfSim(const char *Cmd) {
        UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}};
        sscanf(Cmd, " %"lli" %"lli" %"lli, &c.arg[0], &c.arg[1], &c.arg[2]);
 int CmdLegicRfSim(const char *Cmd) {
        UsbCommand c = {CMD_SIMULATE_TAG_LEGIC_RF, {6,3,0}};
        sscanf(Cmd, " %"lli" %"lli" %"lli, &c.arg[0], &c.arg[1], &c.arg[2]);


@@ -655,20 +526,74 @@ int CmdLegicRfSim(const char *Cmd) {
 
 int CmdLegicRfWrite(const char *Cmd) {
 
 
 int CmdLegicRfWrite(const char *Cmd) {
 

-       // offset - in tag memory
-       // length - num of bytes to be written
-
-       char cmdp = param_getchar(Cmd, 0);
-       if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_write();
-       
-       uint32_t offset = 0, len = 0, IV = 0;
-       
-    int res = sscanf(Cmd, "%x %x %x", &offset, &len, &IV);
-       if(res < 2) {
-               PrintAndLog("Please specify the offset and length as two hex strings and, optionally, the IV also as an hex string");
-        return -1;
-    }
+       uint8_t *data = NULL;
+       uint8_t cmdp = 0;
+       bool errors = false;
+       int len = 0, bg, en;
+       uint32_t offset = 0, IV = 0x55;

        
        

+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+               case 'd':
+               case 'D':
+                       // peek at length of the input string so we can
+                       // figure out how many elements to malloc in "data"
+                       bg=en=0;
+                       if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
+                               errors = true;
+                               break;
+                       }
+                       len = (en - bg + 1);
+
+                       // check that user entered even number of characters
+                       // for hex data string
+                       if (len & 1) {
+                               errors = true;
+                               break;
+                       }
+
+                       // it's possible for user to accidentally enter "b" parameter
+                       // more than once - we have to clean previous malloc
+                       if (data)
+                               free(data);
+                       data = malloc(len >> 1);
+                       if ( data == NULL ) {
+                               PrintAndLog("Can't allocate memory. exiting");
+                               errors = true;
+                               break;
+                       }
+                       
+                       if (param_gethex(Cmd, cmdp+1, data, len)) {
+                               errors = true;
+                               break;
+                       }
+
+                       len >>= 1;      
+                       cmdp += 2;
+                       break;
+               case 'o':
+               case 'O':
+                       offset = param_get32ex(Cmd, cmdp+1, 4, 16);
+                       cmdp += 2;
+                       break;
+               case 'h':
+               case 'H':
+                       errors = true;
+                       break;
+               default:
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                       errors = true;
+                       break;
+               }
+               if (errors) break;
+       }
+       //Validations
+       if (errors){
+               if (data) 
+                       free(data);
+               return usage_legic_write();
+       }
+

        // tagtype
        legic_card_select_t card;
        if (legic_get_type(&card)) {
        // tagtype
        legic_card_select_t card;
        if (legic_get_type(&card)) {


@@ -678,108 +603,51 @@ int CmdLegicRfWrite(const char *Cmd) {
 
        legic_print_type(card.cardsize, 0);
        
 
        legic_print_type(card.cardsize, 0);
        

-       // OUT-OF-BOUNDS check
-       if ( len + offset > card.cardsize ) {
-               PrintAndLog("Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset);
+       // OUT-OF-BOUNDS checks
+       // UID 4 bytes can't be written to.
+       if ( offset < 4 ) {
+               PrintAndLog("Out-of-bounds, UID 4bytes can't be written to. Offset = %d", offset);

                return -2;
        }
        
                return -2;
        }
        

+       if ( len + offset + 4 >= card.cardsize ) {
+               PrintAndLog("Out-of-bounds, Cardsize = %d, [offset+len = %d ]", card.cardsize, len + offset + 4);
+               return -2;
+       }
+

        legic_chk_iv(&IV);
        
        legic_chk_iv(&IV);
        

-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};   
+       PrintAndLog("Writing to tag");
+    UsbCommand c = {CMD_WRITER_LEGIC_RF, {offset, len, IV}};
+       memcpy(c.d.asBytes, data, len);
+       

        clearCommandBuffer();
     SendCommand(&c);
        UsbCommand resp;
        clearCommandBuffer();
     SendCommand(&c);
        UsbCommand resp;

-       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
-               uint8_t isOK = resp.arg[0] & 0xFF;
-                if ( !isOK )
-                        PrintAndLog("failed writing tag");
-       } else {
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 4000)) {

                PrintAndLog("command execution time out");
                return 1;
        }
                PrintAndLog("command execution time out");
                return 1;
        }

-       
-    return 0;
-}
-
-int CmdLegicRfRawWrite(const char *Cmd) {
-
-       char cmdp = param_getchar(Cmd, 0);
-       if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rawwrite();
-       
-       uint32_t offset = 0, data = 0, IV = 0;  
-       char answer;
-
-    int res = sscanf(Cmd, "%x %x %x", &offset, &data, &IV);
-       if(res < 2)
-               return usage_legic_rawwrite();
-       
-       // OUT-OF-BOUNDS check
-       if ( offset > MAX_LENGTH ) {
-               PrintAndLog("Out-of-bound, offset");
+       uint8_t isOK = resp.arg[0] & 0xFF;
+       if ( !isOK ) {
+               PrintAndLog("failed writing tag");

                return 1;
        }
        
                return 1;
        }
        

-       if ( (IV & 0x7F) != IV ){
-               IV &= 0x7F;
-               PrintAndLog("Truncating IV to 7bits");
-       }
-       if ( (IV & 1) == 0 ){
-               IV |= 0x01;  // IV must be odd
-               PrintAndLog("LSB of IV must be SET");   
-       }
-
-       UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {offset, data, IV} };
-       
-       if (c.arg[0] == 0x05 || c.arg[0] == 0x06) {
-               PrintAndLog("############# DANGER !! #############");
-               PrintAndLog("# changing the DCF is irreversible  #");
-               PrintAndLog("#####################################");
-               PrintAndLog("do youe really want to continue? y(es) n(o)");             
-               if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
-                       SendCommand(&c);
-                       return 0;
-               }
-               return -1;
-       }
-       
-       clearCommandBuffer();
-    SendCommand(&c);
-       return 0;
+    return 0;

 }
 
 }
 

-void static calc4(uint8_t *cmd, uint8_t len){
-       crc_t crc;
-       //crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, TRUE, TRUE);
-       crc_init(&crc, 4, 0x19 >> 1, 0x5, 0);
-
-       crc_clear(&crc);
-       crc_update(&crc, 1, 1); /* CMD_READ */
-       crc_update(&crc, cmd[0], 8);
-       crc_update(&crc, cmd[1], 8);
-       printf("crc4 %X\n", reflect(crc_finish(&crc), 4) ) ;
-
-       crc_clear(&crc);
-       crc_update(&crc, 1, 1); /* CMD_READ */
-       crc_update(&crc, cmd[0], 8);
-       crc_update(&crc, cmd[1], 8);
-       printf("crc4 %X\n",  crc_finish(&crc) ) ;
-
-       printf("---- old ---\n");
-       crc_update2(&crc, 1, 1); /* CMD_READ */
-       crc_update2(&crc, cmd[0], 8);
-       crc_update2(&crc, cmd[1], 8);
-       printf("crc4 %X \n", reflect(crc_finish(&crc), 4) ) ;
+/*
+       PrintAndLog("############# DANGER !! #############");
+       PrintAndLog("# changing the DCF is irreversible  #");
+       PrintAndLog("#####################################");
+       PrintAndLog("do youe really want to continue? y(es) n(o)");             
+       // if (scanf(" %c", &answer) > 0 && (answer == 'y' || answer == 'Y')) {
+               // return 0;
+       // }
+*/

 
 

-       
-       crc_clear(&crc);
-       crc_update2(&crc, 1, 1); /* CMD_READ */
-       crc_update2(&crc, cmd[0], 8);
-       crc_update2(&crc, cmd[1], 8);
-       printf("crc4 %X\n",  crc_finish(&crc) ) ;
-}      
- 
-int CmdLegicCalcCrc8(const char *Cmd){
+int CmdLegicCalcCrc(const char *Cmd){

 
        uint8_t *data = NULL;
        uint8_t cmdp = 0, uidcrc = 0, type=0;
 
        uint8_t *data = NULL;
        uint8_t cmdp = 0, uidcrc = 0, type=0;


@@ -849,16 +717,13 @@ int CmdLegicCalcCrc8(const char *Cmd){
        //Validations
        if (errors){
                if (data) free(data);
        //Validations
        if (errors){
                if (data) free(data);

-               return usage_legic_calccrc8();
+               return usage_legic_calccrc();

        }
        
        switch (type){
                case 16:
                        PrintAndLog("Legic crc16: %X", CRC16Legic(data, len, uidcrc));
                        break;
        }
        
        switch (type){
                case 16:
                        PrintAndLog("Legic crc16: %X", CRC16Legic(data, len, uidcrc));
                        break;

-               case 4:
-                       calc4(data, 0);
-                       break;

                default:
                        PrintAndLog("Legic crc8: %X",  CRC8Legic(data, len) );
                        break;
                default:
                        PrintAndLog("Legic crc8: %X",  CRC8Legic(data, len) );
                        break;


@@ -912,21 +777,17 @@ void legic_chk_iv(uint32_t *iv){
                PrintAndLog("LSB of IV must be SET %u", *iv);   
        }
 }
                PrintAndLog("LSB of IV must be SET %u", *iv);   
        }
 }

-

 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {
 void legic_seteml(uint8_t *src, uint32_t offset, uint32_t numofbytes) {

-

        size_t len = 0;
        UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};     
        size_t len = 0;
        UsbCommand c = {CMD_LEGIC_ESET, {0, 0, 0}};     

-

        for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                
                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);         
                c.arg[0] = i; // offset
                c.arg[1] = len; // number of bytes
        for(size_t i = 0; i < numofbytes; i += USB_CMD_DATA_SIZE) {
                
                len = MIN((numofbytes - i), USB_CMD_DATA_SIZE);         
                c.arg[0] = i; // offset
                c.arg[1] = len; // number of bytes

-               memcpy(c.d.asBytes, src, len); 
+               memcpy(c.d.asBytes, src+i, len); 

                clearCommandBuffer();
                SendCommand(&c);
                clearCommandBuffer();
                SendCommand(&c);

-               PrintAndLog("ICE: offset %d | len %d", i, len);

        }
 }
 
        }
 }
 


@@ -1023,6 +884,7 @@ int CmdLegicDump(const char *Cmd){
                PrintAndLog("Fail, cannot allocate memory");
                return 3;
        }
                PrintAndLog("Fail, cannot allocate memory");
                return 3;
        }

+       memset(data, 0, readlen);

        
        if ( readlen != dumplen )
                PrintAndLog("Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);
        
        if ( readlen != dumplen )
                PrintAndLog("Fail, only managed to read 0x%02X bytes of 0x%02X", readlen, dumplen);


@@ -1054,6 +916,96 @@ int CmdLegicDump(const char *Cmd){
        return 0;
 }      
 
        return 0;
 }      
 

+int CmdLegicRestore(const char *Cmd){
+
+       FILE *f;
+       char filename[FILE_PATH_SIZE] = {0x00};
+       char *fnameptr = filename;
+       size_t fileNlen = 0;
+       bool errors = false;
+       uint16_t numofbytes;    
+       uint8_t cmdp = 0;
+       
+       memset(filename, 0, sizeof(filename));
+       
+       while(param_getchar(Cmd, cmdp) != 0x00) {
+               switch(param_getchar(Cmd, cmdp)) {
+                       case 'h':
+                       case 'H':
+                               errors = true;
+                               break;
+                       case 'i':
+                       case 'I':
+                               fileNlen = param_getstr(Cmd, cmdp+1, filename);
+                               if (!fileNlen) 
+                                       errors = true; 
+                               if (fileNlen > FILE_PATH_SIZE-5) 
+                                       fileNlen = FILE_PATH_SIZE-5;
+                               cmdp += 2;
+                               break;
+                       default:
+                               PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+                               errors = true;
+                               break;
+               }
+               if(errors) break;
+       }
+
+       //Validations
+       if(errors) return usage_legic_restore();
+       
+       // tagtype
+       legic_card_select_t card;
+       if (legic_get_type(&card)) {
+               PrintAndLog("Failed to identify tagtype");
+               return 1;
+       }
+       numofbytes = card.cardsize;     
+       
+       // set up buffer
+       uint8_t *data = malloc(numofbytes);
+       if (!data) {
+               PrintAndLog("Fail, cannot allocate memory");
+               return 3;               
+       }
+       memset(data, 0, numofbytes);
+       
+       legic_print_type(numofbytes, 0);        
+
+       // set up file
+       fnameptr += fileNlen;
+       sprintf(fnameptr, ".bin");
+       
+       PrintAndLog("Reading binary file...");
+
+       if ((f = fopen(filename,"rb")) == NULL) {
+               PrintAndLog("File %s not found or locked", filename);
+               return 2;
+       }       
+       
+       // verify size of dumpfile is the same as card.
+
+       // load file
+       size_t bytes_read = fread(data, 1, numofbytes, f);
+       if ( bytes_read == 0){
+               PrintAndLog("File reading error");
+               free(data);
+               fclose(f);
+               return 2;
+       }
+       fclose(f);
+
+       PrintAndLog("Restoring %s to card", filename);
+
+       //loop writing :)
+
+       //endloop
+       
+       free(data);     
+       PrintAndLog("\nLoaded %d bytes from file: %s  to emulator memory", numofbytes, filename);
+       return 0;
+}
+

 int CmdLegicELoad(const char *Cmd) {
        FILE * f;
        char filename[FILE_PATH_SIZE];
 int CmdLegicELoad(const char *Cmd) {
        FILE * f;
        char filename[FILE_PATH_SIZE];


@@ -1086,7 +1038,7 @@ int CmdLegicELoad(const char *Cmd) {
        if (len > FILE_PATH_SIZE - 5) 
                len = FILE_PATH_SIZE - 5;
        fnameptr += len;
        if (len > FILE_PATH_SIZE - 5) 
                len = FILE_PATH_SIZE - 5;
        fnameptr += len;

-       sprintf(fnameptr, ".bin");      
+       sprintf(fnameptr, ".bin");

        
        // open file
        if ((f = fopen(filename,"rb")) == NULL) { 
        
        // open file
        if ((f = fopen(filename,"rb")) == NULL) { 


@@ -1148,8 +1100,7 @@ int CmdLegicESave(const char *Cmd) {
        memset(data, 0, numofbytes);
                
        // download emulator memory
        memset(data, 0, numofbytes);
                
        // download emulator memory

-       PrintAndLog("Reading emulator memory...");
-       
+       PrintAndLog("Reading emulator memory...");      

        GetEMLFromBigBuf(data, numofbytes, 0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
                PrintAndLog("Fail, transfer from device time-out");
        GetEMLFromBigBuf(data, numofbytes, 0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)) {
                PrintAndLog("Fail, transfer from device time-out");


@@ -1175,20 +1126,25 @@ int CmdLegicESave(const char *Cmd) {
        PrintAndLog("\nSaved %d bytes from emulator memory to file: %s", numofbytes, filename);
        return 0;
 }
        PrintAndLog("\nSaved %d bytes from emulator memory to file: %s", numofbytes, filename);
        return 0;
 }

-       
+
+int CmdLegicList(const char *Cmd) {
+       CmdHFList("legic");
+       return 0;
+}
+

 static command_t CommandTable[] =  {
        {"help",        CmdHelp,                        1, "This help"},
 static command_t CommandTable[] =  {
        {"help",        CmdHelp,                        1, "This help"},

-       {"reader",      CmdLegicReader,         1, "LEGIC Prime Reader UID and Type tag info"},
+       {"reader",      CmdLegicReader,         1, "LEGIC Prime Reader UID and tag info"},

        {"info",        CmdLegicInfo,           0, "Display deobfuscated and decoded LEGIC Prime tag data"},
        {"info",        CmdLegicInfo,           0, "Display deobfuscated and decoded LEGIC Prime tag data"},

-       {"dump",        CmdLegicDump,           0, "Dump LEGIC Prime card to binary file"},
-       {"rdmem",       CmdLegicRdmem,          0, "[offset][length] <iv> -- read bytes from a LEGIC card"},
-       {"save",        CmdLegicSave,           0, "<filename> [<length>] -- Store samples"},
-       {"load",        CmdLegicLoad,           0, "<filename> -- Restore samples"},
-       {"sim",         CmdLegicRfSim,          0, "[phase drift [frame drift [req/resp drift]]] Start tag simulator (use after load or read)"},
-       {"write",       CmdLegicRfWrite,        0, "<offset> <length> <iv> -- Write sample buffer (user after load or read)"},
-       {"crc8",        CmdLegicCalcCrc8,       1, "Calculate Legic CRC8 over given hexbytes"}, 
+       {"dump",        CmdLegicDump,           0, "Dump LEGIC Prime tag to binary file"},
+       {"restore", CmdLegicRestore,    0, "Restore a dump onto a LEGIC Prime tag"},
+       {"rdmem",       CmdLegicRdmem,          0, "Read bytes from a LEGIC Prime tag"},
+       {"sim",         CmdLegicRfSim,          0, "Start tag simulator"},
+       {"write",       CmdLegicRfWrite,        0, "Write data to a LEGIC Prime tag"},
+       {"crc",         CmdLegicCalcCrc,        1, "Calculate Legic CRC over given bytes"},     

        {"eload",       CmdLegicELoad,          1, "Load binary dump to emulator memory"},
        {"esave",       CmdLegicESave,          1, "Save emulator memory to binary file"},
        {"eload",       CmdLegicELoad,          1, "Load binary dump to emulator memory"},
        {"esave",       CmdLegicESave,          1, "Save emulator memory to binary file"},

+       {"list",        CmdLegicList,           1, "[Deprecated] List LEGIC history"},

        {NULL, NULL, 0, NULL}
 };
 
        {NULL, NULL, 0, NULL}
 };