CHG: libcurses

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 4ad60e3b073e32e2a851faadfa1e1c82b91f81ab..6b880da69281c7bf20df0a4ddb463cd306b7ebbb 100644 (file)
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -11,11 +11,14 @@
 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 

+#define MAX_LENGTH 1024        
+

 int usage_legic_calccrc8(void){
        PrintAndLog("Calculates the legic crc8/crc16 on the input hexbytes.");
        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("Options:");
 int usage_legic_calccrc8(void){
        PrintAndLog("Calculates the legic crc8/crc16 on the input hexbytes.");
        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("Options:");

+       PrintAndLog("      h             : this help");

        PrintAndLog("      b <hexbytes>  : hex bytes");
        PrintAndLog("      u <uidcrc>    : MCC hexbyte");
        PrintAndLog("      c <crc type>  : 8|16 bit crc size");
        PrintAndLog("      b <hexbytes>  : hex bytes");
        PrintAndLog("      u <uidcrc>    : MCC hexbyte");
        PrintAndLog("      c <crc type>  : 8|16 bit crc size");


@@ -25,123 +28,166 @@ int usage_legic_calccrc8(void){
        PrintAndLog("      hf legic crc8 b deadbeef1122 u 9A c 16");
        return 0;
 }
        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");
 int usage_legic_load(void){
        PrintAndLog("It loads datasamples from the file `filename` to device memory");

-       PrintAndLog("Usage:  hf legic load <file name>");
+       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");
        return 0;
 }
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic load filename");
        return 0;
 }

-

 int usage_legic_read(void){    
        PrintAndLog("Read data from a legic tag.");
 int usage_legic_read(void){    
        PrintAndLog("Read data from a legic tag.");

-       PrintAndLog("Usage:  hf legic read <offset> <num of bytes>");
+       PrintAndLog("Usage:  hf legic read [h] <offset> <length> <IV>");

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

-       PrintAndLog("  <offset>        : offset in data array to start download from");
-       PrintAndLog("  <num of bytes>  : number of bytes to download");
+       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("");
        PrintAndLog("Samples:");
        PrintAndLog("");
        PrintAndLog("Samples:");

-       PrintAndLog("      hf legic read");
+       PrintAndLog("      hf legic read 0 21        - reads from byte[0] 21 bytes(system header)");
+       PrintAndLog("      hf legic read 0 4 55      - reads from byte[0] 4 bytes with IV 0x55");
+       PrintAndLog("      hf legic read 0 100 55    - reads 256bytes with IV 0x55");
+       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("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("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic write 10 4      - writes 0x4 to byte[0x10]");
+       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>");
+       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("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic writeraw 10 4    - writes 0x4 to byte[0x10]");
+       return 0;
+}
+int usage_legic_fill(void){
+       PrintAndLog("Missing help text.");
+       return 0;
+}
+int usage_legic_info(void){
+       PrintAndLog("Read info from a legic tag.");
+       PrintAndLog("Usage:  hf legic info [h]");
+       PrintAndLog("Options:");
+       PrintAndLog("  h             : this help");
+       PrintAndLog("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic info");

        return 0;
 }
        return 0;
 }

-

 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held
  *  by Henryk Ploetz and Karsten Nohl at 26c3
  */
 int CmdLegicDecode(const char *Cmd) {
 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held
  *  by Henryk Ploetz and Karsten Nohl at 26c3
  */
 int CmdLegicDecode(const char *Cmd) {

-       // Index for the bytearray.
-       int i = 0;
-       int k = 0, segmentNum;
-       int segment_len = 0;
-       int segment_flag = 0;
+
+       int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0;
+       int crc = 0, wrp = 0, wrc = 0;

        uint8_t stamp_len = 0;
        uint8_t stamp_len = 0;

-       int crc = 0;
-       int wrp = 0;
-       int wrc = 0;
-       uint8_t data_buf[1052]; // receiver buffer,  should be 1024..
-       char token_type[5];
-       int dcf;
+       uint8_t data[1024]; // receiver buffer
+       char token_type[5] = {0,0,0,0,0};
+       int dcf = 0;

        int bIsSegmented = 0;
 
        int bIsSegmented = 0;
 

-       // download EML memory, where the "legic read" command puts the data.
-       GetEMLFromBigBuf(data_buf, sizeof(data_buf), 0);
+       // copy data from device
+       GetEMLFromBigBuf(data, sizeof(data), 0);

        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
                PrintAndLog("Command execute timeout");
                return 1;
        }
        
        // Output CDF System area (9 bytes) plus remaining header area (12 bytes)
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
                PrintAndLog("Command execute timeout");
                return 1;
        }
        
        // Output CDF System area (9 bytes) plus remaining header area (12 bytes)

-       crc = data_buf[4];
-       uint32_t calc_crc =  CRC8Legic(data_buf, 4);    
+       crc = data[4];
+       uint32_t calc_crc =  CRC8Legic(data, 4);        

        
        PrintAndLog("\nCDF: System Area");
        PrintAndLog("------------------------------------------------------");
        PrintAndLog("MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",
        
        PrintAndLog("\nCDF: System Area");
        PrintAndLog("------------------------------------------------------");
        PrintAndLog("MCD: %02x, MSN: %02x %02x %02x, MCC: %02x %s",

-               data_buf[0],
-               data_buf[1],
-               data_buf[2],
-               data_buf[3],
-               data_buf[4],
-               (calc_crc == crc) ? "OK":"Fail" 
+               data[0],
+               data[1],
+               data[2],
+               data[3],
+               data[4],
+               (calc_crc == crc) ? "OK":"Fail"

        );
  
 
        token_type[0] = 0;
        );
  
 
        token_type[0] = 0;

-       dcf = ((int)data_buf[6] << 8) | (int)data_buf[5];
+       dcf = ((int)data[6] << 8) | (int)data[5];

 
        // New unwritten media?
        if(dcf == 0xFFFF) {
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=NM (New Media)",
                        dcf,
 
        // New unwritten media?
        if(dcf == 0xFFFF) {
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=NM (New Media)",
                        dcf,

-                       data_buf[5],
-                       data_buf[6]
+                       data[5],
+                       data[6]

                );
        
        } else if(dcf > 60000) {                // Master token?
 
                int fl = 0;
 
                );
        
        } else if(dcf > 60000) {                // Master token?
 
                int fl = 0;
 

-               if(data_buf[6] == 0xec) {
+               if(data[6] == 0xec) {

                        strncpy(token_type, "XAM", sizeof(token_type));
                        fl = 1;
                        strncpy(token_type, "XAM", sizeof(token_type));
                        fl = 1;

-                       stamp_len = 0x0c - (data_buf[5] >> 4);
+                       stamp_len = 0x0c - (data[5] >> 4);

                } else {
                } else {

-       switch (data_buf[5] & 0x7f) {
-               case 0x00 ... 0x2f:
-                       strncpy(token_type, "IAM",sizeof(token_type));
-                                       fl = (0x2f - (data_buf[5] & 0x7f)) + 1;
-                       break;
-               case 0x30 ... 0x6f:
-                       strncpy(token_type, "SAM",sizeof(token_type));
-                                       fl = (0x6f - (data_buf[5] & 0x7f)) + 1;
-                       break;
-               case 0x70 ... 0x7f:
-                       strncpy(token_type, "GAM",sizeof(token_type));
-                                       fl = (0x7f - (data_buf[5] & 0x7f)) + 1;
-                       break;
-       }
+                       switch (data[5] & 0x7f) {
+                       case 0x00 ... 0x2f:
+                               strncpy(token_type, "IAM", sizeof(token_type));
+                               fl = (0x2f - (data[5] & 0x7f)) + 1;
+                               break;
+                       case 0x30 ... 0x6f:
+                               strncpy(token_type, "SAM", sizeof(token_type));
+                               fl = (0x6f - (data[5] & 0x7f)) + 1;
+                               break;
+                       case 0x70 ... 0x7f:
+                               strncpy(token_type, "GAM", sizeof(token_type));
+                               fl = (0x7f - (data[5] & 0x7f)) + 1;
+                               break;
+                       }

 
 

-       stamp_len = 0xfc - data_buf[6];
+                       stamp_len = 0xfc - data[6];

                }
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
                        dcf,
                }
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u), OL=%02u, FL=%02u",
                        dcf,

-               data_buf[5],
-               data_buf[6],
-               token_type,
-               (data_buf[5]&0x80)>>7,
+                       data[5],
+                       data[6],
+                       token_type,
+                       (data[5] & 0x80 )>> 7,

                        stamp_len,
                        fl
                        stamp_len,
                        fl

-       );
+               );

 
 

-       } else {                                                // Is IM(-S) type of card...
+       } else {        // Is IM(-S) type of card...

 
 

-               if(data_buf[7] == 0x9F && data_buf[8] == 0xFF) {
+               if(data[7] == 0x9F && data[8] == 0xFF) {

                        bIsSegmented = 1;
                        strncpy(token_type, "IM-S", sizeof(token_type));
                } else {
                        bIsSegmented = 1;
                        strncpy(token_type, "IM-S", sizeof(token_type));
                } else {


@@ -150,10 +196,10 @@ int CmdLegicDecode(const char *Cmd) {
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
                        dcf,
 
                PrintAndLog("DCF: %d (%02x %02x), Token Type=%s (OLE=%01u)",
                        dcf,

-                       data_buf[5],
-                       data_buf[6],
+                       data[5],
+                       data[6],

                        token_type,
                        token_type,

-                       (data_buf[5]&0x80)>>7
+                       (data[5]&0x80) >> 7

                );
        }
 
                );
        }
 


@@ -162,142 +208,140 @@ int CmdLegicDecode(const char *Cmd) {
 
                if(bIsSegmented) {
                        PrintAndLog("WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",
 
                if(bIsSegmented) {
                        PrintAndLog("WRP=%02u, WRC=%01u, RD=%01u, SSC=%02x",

-               data_buf[7]&0x0f,
-               (data_buf[7]&0x70)>>4,
-               (data_buf[7]&0x80)>>7,
-               data_buf[8]
-       );
+                               data[7] & 0x0f,
+                               (data[7] & 0x70) >> 4,
+                               (data[7] & 0x80) >> 7,
+                               data[8]
+                       );

                }
 
                // Header area is only available on IM-S cards, on master tokens this data is the master token data itself
                if(bIsSegmented || dcf > 60000) {
                        if(dcf > 60000) {
                                PrintAndLog("Master token data");
                }
 
                // Header area is only available on IM-S cards, on master tokens this data is the master token data itself
                if(bIsSegmented || dcf > 60000) {
                        if(dcf > 60000) {
                                PrintAndLog("Master token data");

-                               PrintAndLog("%s", sprint_hex(data_buf+8, 14));
+                               PrintAndLog("%s", sprint_hex(data+8, 14));

                        } else {
                        } else {

-       PrintAndLog("Remaining Header Area");
-       PrintAndLog("%s", sprint_hex(data_buf+9, 13));
+                               PrintAndLog("Remaining Header Area");
+                               PrintAndLog("%s", sprint_hex(data+9, 13));

                        }
                }
        }
                        }
                }
        }

-

        
        

-       uint8_t segCrcBytes[8] = {0x00};
+       uint8_t segCrcBytes[8] = {0,0,0,0,0,0,0,0};

        uint32_t segCalcCRC = 0;
        uint32_t segCRC = 0;
 
        uint32_t segCalcCRC = 0;
        uint32_t segCRC = 0;
 

-

        // Data card?
        if(dcf <= 60000) {
        
        // Data card?
        if(dcf <= 60000) {
        

-       PrintAndLog("\nADF: User Area");
-       PrintAndLog("------------------------------------------------------");
+               PrintAndLog("\nADF: User Area");
+               PrintAndLog("------------------------------------------------------");

 
                if(bIsSegmented) {
 
                        // Data start point on segmented cards
 
                if(bIsSegmented) {
 
                        // Data start point on segmented cards

-       i = 22;  
+                       i = 22;  

 
                        // decode segments
                        for (segmentNum=1; segmentNum < 128; segmentNum++ )
                        {
 
                        // decode segments
                        for (segmentNum=1; segmentNum < 128; segmentNum++ )
                        {

-               segment_len = ((data_buf[i+1]^crc)&0x0f) * 256 + (data_buf[i]^crc);
-               segment_flag = ((data_buf[i+1]^crc)&0xf0)>>4;
-               wrp = (data_buf[i+2]^crc);
-               wrc = ((data_buf[i+3]^crc)&0x70)>>4;
-
-               bool hasWRC = (wrc > 0);
-               bool hasWRP = (wrp > wrc);
-               int wrp_len = (wrp - wrc);
-               int remain_seg_payload_len = (segment_len - wrp - 5);
+                               segment_len = ((data[i+1] ^ crc) & 0x0f) * 256 + (data[i] ^ crc);
+                               segment_flag = ((data[i+1] ^ crc) & 0xf0) >> 4;
+                               wrp = (data[i+2] ^ crc);
+                               wrc = ((data[i+3] ^ crc) & 0x70) >> 4;
+
+                               bool hasWRC = (wrc > 0);
+                               bool hasWRP = (wrp > wrc);
+                               int wrp_len = (wrp - wrc);
+                               int remain_seg_payload_len = (segment_len - wrp - 5);

                
                

-               // validate segment-crc
-               segCrcBytes[0]=data_buf[0];                     //uid0
-               segCrcBytes[1]=data_buf[1];                     //uid1
-               segCrcBytes[2]=data_buf[2];                     //uid2
-               segCrcBytes[3]=data_buf[3];                     //uid3
-               segCrcBytes[4]=(data_buf[i]^crc);       //hdr0
-               segCrcBytes[5]=(data_buf[i+1]^crc); //hdr1
-               segCrcBytes[6]=(data_buf[i+2]^crc); //hdr2
-               segCrcBytes[7]=(data_buf[i+3]^crc); //hdr3
-
-               segCalcCRC = CRC8Legic(segCrcBytes, 8);
-               segCRC = data_buf[i+4]^crc;
-
-               PrintAndLog("Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
-                       segmentNum,
-                       data_buf[i]^crc,
-                       data_buf[i+1]^crc,
-                       data_buf[i+2]^crc,
-                       data_buf[i+3]^crc,
-                       segment_len, 
-                       segment_flag,
-                       (segment_flag & 0x4) >> 2,
-                       (segment_flag & 0x8) >> 3,
-                       wrp,
-                       wrc,
-                       ((data_buf[i+3]^crc) & 0x80) >> 7,
-                       segCRC,
-                       ( segCRC == segCalcCRC ) ? "OK" : "fail"
-               );
-
-               i += 5;
+                               // validate segment-crc
+                               segCrcBytes[0]=data[0];                 //uid0
+                               segCrcBytes[1]=data[1];                 //uid1
+                               segCrcBytes[2]=data[2];                 //uid2
+                               segCrcBytes[3]=data[3];                 //uid3
+                               segCrcBytes[4]=(data[i] ^ crc);   //hdr0
+                               segCrcBytes[5]=(data[i+1] ^ crc); //hdr1
+                               segCrcBytes[6]=(data[i+2] ^ crc); //hdr2
+                               segCrcBytes[7]=(data[i+3] ^ crc); //hdr3
+
+                               segCalcCRC = CRC8Legic(segCrcBytes, 8);
+                               segCRC = data[i+4] ^ crc;
+
+                               PrintAndLog("Segment %02u \nraw header | 0x%02X 0x%02X 0x%02X 0x%02X \nSegment len: %u,  Flag: 0x%X (valid:%01u, last:%01u), WRP: %02u, WRC: %02u, RD: %01u, CRC: 0x%02X (%s)",
+                                       segmentNum,
+                                       data[i] ^ crc,
+                                       data[i+1] ^ crc,
+                                       data[i+2] ^ crc,
+                                       data[i+3] ^ crc,
+                                       segment_len, 
+                                       segment_flag,
+                                       (segment_flag & 0x4) >> 2,
+                                       (segment_flag & 0x8) >> 3,
+                                       wrp,
+                                       wrc,
+                                       ((data[i+3]^crc) & 0x80) >> 7,
+                                       segCRC,
+                                       ( segCRC == segCalcCRC ) ? "OK" : "fail"
+                               );
+
+                               i += 5;

     
     

-               if ( hasWRC ) {
-                       PrintAndLog("WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
-                       PrintAndLog("\nrow  | data");
-                       PrintAndLog("-----+------------------------------------------------");
+                               if ( hasWRC ) {
+                                       PrintAndLog("WRC protected area:   (I %d | K %d| WRC %d)", i, k, wrc);
+                                       PrintAndLog("\nrow  | data");
+                                       PrintAndLog("-----+------------------------------------------------");

 
 

-                                       for ( k=i; k < (i+wrc); ++k)
-                                       data_buf[k] ^= crc;
+                                       for ( k=i; k < (i + wrc); ++k)
+                                               data[k] ^= crc;

 
 

-                       print_hex_break( data_buf+i, wrc, 16);
+                                       print_hex_break( data+i, wrc, 16);

                        
                        

-                       i += wrc;
-               }
+                                       i += wrc;
+                               }

     
     

-               if ( hasWRP ) {
-                       PrintAndLog("Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
-                       PrintAndLog("\nrow  | data");
-                       PrintAndLog("-----+------------------------------------------------");
+                               if ( hasWRP ) {
+                                       PrintAndLog("Remaining write protected area:  (I %d | K %d | WRC %d | WRP %d  WRP_LEN %d)",i, k, wrc, wrp, wrp_len);
+                                       PrintAndLog("\nrow  | data");
+                                       PrintAndLog("-----+------------------------------------------------");

 
                                        for (k=i; k < (i+wrp_len); ++k)
 
                                        for (k=i; k < (i+wrp_len); ++k)

-                                       data_buf[k] ^= crc;
+                                               data[k] ^= crc;

                        
                        

-                       print_hex_break( data_buf+i, wrp_len, 16);
+                                       print_hex_break( data+i, wrp_len, 16);

                        
                        

-                       i += wrp_len;
+                                       i += wrp_len;

                        
                                        // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
                        
                                        // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)

-                       if( wrp_len == 8 )
-                               PrintAndLog("Card ID: %2X%02X%02X", data_buf[i-4]^crc, data_buf[i-3]^crc, data_buf[i-2]^crc);                   
-               }
+                                       if( wrp_len == 8 )
+                                               PrintAndLog("Card ID: %2X%02X%02X", data[i-4]^crc, data[i-3]^crc, data[i-2]^crc);                       
+                               }

     
     

-               PrintAndLog("Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
-               PrintAndLog("\nrow  | data");
-               PrintAndLog("-----+------------------------------------------------");
+                               PrintAndLog("Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);
+                               PrintAndLog("\nrow  | data");
+                               PrintAndLog("-----+------------------------------------------------");

 
                                for ( k=i; k < (i+remain_seg_payload_len); ++k)
 
                                for ( k=i; k < (i+remain_seg_payload_len); ++k)

-                               data_buf[k] ^= crc;
+                                       data[k] ^= crc;

                
                

-               print_hex_break( data_buf+i, remain_seg_payload_len, 16);
+                               print_hex_break( data+i, remain_seg_payload_len, 16);

     
     

-               i += remain_seg_payload_len;
+                               i += remain_seg_payload_len;

                
                

-               PrintAndLog("-----+------------------------------------------------\n");
+                               PrintAndLog("-----+------------------------------------------------\n");

 
 

-               // end with last segment
-               if (segment_flag & 0x8) return 0;
+                               // end with last segment
+                               if (segment_flag & 0x8) return 0;

 
 

-       } // end for loop
+                       } // end for loop

                
                } else {
 
                        // Data start point on unsegmented cards
                        i = 8;
 
                
                } else {
 
                        // Data start point on unsegmented cards
                        i = 8;
 

-                       wrp          = data_buf[7] & 0x0F;
-                       wrc          = (data_buf[7] & 0x07) >> 4;
+                       wrp = data[7] & 0x0F;
+                       wrc = (data[7] & 0x70) >> 4;

 
                        bool hasWRC = (wrc > 0);
                        bool hasWRP = (wrp > wrc);
 
                        bool hasWRC = (wrc > 0);
                        bool hasWRP = (wrp > wrc);


@@ -307,14 +351,14 @@ int CmdLegicDecode(const char *Cmd) {
                        PrintAndLog("Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
                                wrp,
                                wrc,
                        PrintAndLog("Unsegmented card - WRP: %02u, WRC: %02u, RD: %01u",
                                wrp,
                                wrc,

-                               (data_buf[7] & 0x80) >> 7
+                               (data[7] & 0x80) >> 7

                        );
 
                        if ( hasWRC ) {
                                PrintAndLog("WRC protected area:   (I %d | WRC %d)", i, wrc);
                                PrintAndLog("\nrow  | data");
                                PrintAndLog("-----+------------------------------------------------");
                        );
 
                        if ( hasWRC ) {
                                PrintAndLog("WRC protected area:   (I %d | WRC %d)", i, wrc);
                                PrintAndLog("\nrow  | data");
                                PrintAndLog("-----+------------------------------------------------");

-                               print_hex_break( data_buf+i, wrc, 16);
+                               print_hex_break( data+i, wrc, 16);

                                i += wrc;
                        }
     
                                i += wrc;
                        }
     


@@ -322,48 +366,96 @@ int CmdLegicDecode(const char *Cmd) {
                                PrintAndLog("Remaining write protected area:  (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len);
                                PrintAndLog("\nrow  | data");
                                PrintAndLog("-----+------------------------------------------------");
                                PrintAndLog("Remaining write protected area:  (I %d | WRC %d | WRP %d | WRP_LEN %d)", i, wrc, wrp, wrp_len);
                                PrintAndLog("\nrow  | data");
                                PrintAndLog("-----+------------------------------------------------");

-                               print_hex_break( data_buf+i, wrp_len, 16);
+                               print_hex_break( data + i, wrp_len, 16);

                                i += wrp_len;
                        
                                // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
                                if( wrp_len == 8 )
                                i += wrp_len;
                        
                                // does this one work? (Answer: Only if KGH/BGH is used with BCD encoded card number! So maybe this will show just garbage...)
                                if( wrp_len == 8 )

-                                       PrintAndLog("Card ID: %2X%02X%02X", data_buf[i-4], data_buf[i-3], data_buf[i-2]);
+                                       PrintAndLog("Card ID: %2X%02X%02X", data[i-4], data[i-3], data[i-2]);

                        }
     
                        PrintAndLog("Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
                        PrintAndLog("\nrow  | data");
                        PrintAndLog("-----+------------------------------------------------");
                        }
     
                        PrintAndLog("Remaining segment payload:  (I %d | Remain LEN %d)", i, remain_seg_payload_len);
                        PrintAndLog("\nrow  | data");
                        PrintAndLog("-----+------------------------------------------------");

-                       print_hex_break( data_buf+i, remain_seg_payload_len, 16);
+                       print_hex_break( data + i, remain_seg_payload_len, 16);

                        i += remain_seg_payload_len;
                
                        PrintAndLog("-----+------------------------------------------------\n");
                }
        }
                        i += remain_seg_payload_len;
                
                        PrintAndLog("-----+------------------------------------------------\n");
                }
        }

-

        return 0;
 }
 
 int CmdLegicRFRead(const char *Cmd) {
        return 0;
 }
 
 int CmdLegicRFRead(const char *Cmd) {

-       
+

        // params:
        // params:

-       // offset in data
-       // number of bytes.
+       // offset in data memory
+       // number of bytes to read

        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_read();
        
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_read();
        

-       int byte_count=0, offset=0;
-       sscanf(Cmd, "%i %i", &offset, &byte_count);
-       if(byte_count == 0) byte_count = -1;
-       if(byte_count + offset > 1024) byte_count = 1024 - offset;
+       uint32_t offset = 0, len = 0, IV = 1;
+       sscanf(Cmd, "%x %x %x", &offset, &len, &IV);

 
 

-       UsbCommand c= {CMD_READER_LEGIC_RF, {offset, byte_count, 0}};
+       // 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);
+       }
+       
+       if ( (IV & 0x7F) != IV ){
+               IV &= 0x7F;
+               PrintAndLog("Truncating IV to 7bits");
+       }
+       
+       if ( (IV & 1) == 0 ){
+               IV |= 0x01;
+               PrintAndLog("LSB of IV must be SET");   
+       }
+       
+       UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};

        clearCommandBuffer();
        SendCommand(&c);
        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 {
+               PrintAndLog("command execution time out");
+               return 1;
+       }

        return 0;
 }
 
 int CmdLegicLoad(const char *Cmd) {
        return 0;
 }
 
 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 cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' || cmdp == 0x00) return usage_legic_load();
 


@@ -444,9 +536,11 @@ int CmdLegicSave(const char *Cmd) {
        int requested = 1024;
        int offset = 0;
        int delivered = 0;
        int requested = 1024;
        int offset = 0;
        int delivered = 0;

-       char filename[FILE_PATH_SIZE];
+       char filename[FILE_PATH_SIZE] = {0x00};

        uint8_t got[1024] = {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 */
        sscanf(Cmd, " %s %i %i", filename, &requested, &offset);
 
        /* If no length given save entire legic read buffer */


@@ -499,28 +593,84 @@ int CmdLegicRfSim(const char *Cmd) {
        return 0;
 }
 
        return 0;
 }
 

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

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

-    UsbCommand c = {CMD_WRITER_LEGIC_RF};
-    int res = sscanf(Cmd, " 0x%"llx" 0x%"llx, &c.arg[0], &c.arg[1]);
-       if(res != 2) {
-               PrintAndLog("Please specify the offset and length as two hex strings");
+
+       // params:
+       // offset - in tag memory
+       // length - num of bytes to be written
+       // IV - initialisation vector
+       
+       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;
     }
         return -1;
     }

+
+       // 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);
+       }
+       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_WRITER_LEGIC_RF, {offset, len, IV}};   

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

+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+               uint8_t isOK = resp.arg[0] & 0xFF;
+                if ( isOK ) {
+                } else {
+                        PrintAndLog("failed writig tag");
+                }
+       } else {
+               PrintAndLog("command execution time out");
+               return 1;
+       }
+       

     return 0;
 }
 
     return 0;
 }
 

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

 int CmdLegicRfRawWrite(const char *Cmd) {
 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;
        char answer;

-    UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {0,0,0} };
-    int res = sscanf(Cmd, " 0x%"llx" 0x%"llx, &c.arg[0], &c.arg[1]);
-       if(res != 2) {
-               PrintAndLog("Please specify the offset and value as two hex strings");
-        return -1;
-    }
+
+    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");
+               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 !! #############");
        
        if (c.arg[0] == 0x05 || c.arg[0] == 0x06) {
                PrintAndLog("############# DANGER !! #############");


@@ -564,6 +714,37 @@ int CmdLegicRfFill(const char *Cmd) {
     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) ) ;
+
+       
+       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){
 
        uint8_t *data = NULL;
 int CmdLegicCalcCrc8(const char *Cmd){
 
        uint8_t *data = NULL;


@@ -639,10 +820,13 @@ int CmdLegicCalcCrc8(const char *Cmd){
        
        switch (type){
                case 16:
        
        switch (type){
                case 16:

-                       PrintAndLog("LEGIC CRC16: %X", CRC16Legic(data, len, uidcrc));
+                       PrintAndLog("Legic crc16: %X", CRC16Legic(data, len, uidcrc));
+                       break;
+               case 4:
+                       calc4(data, 0);

                        break;
                default:
                        break;
                default:

-                       PrintAndLog("LEGIC CRC8: %X",  CRC8Legic(data, len) );
+                       PrintAndLog("Legic crc8: %X",  CRC8Legic(data, len) );

                        break;
        }
        
                        break;
        }
        


@@ -650,17 +834,58 @@ int CmdLegicCalcCrc8(const char *Cmd){
        return 0;
 } 
  
        return 0;
 } 
  

+int HFLegicInfo(const char *Cmd, bool verbose) {
+
+       char cmdp = param_getchar(Cmd, 0);
+       if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_info();
+       
+       UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}};
+       clearCommandBuffer();
+    SendCommand(&c);
+       UsbCommand resp;
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 500)) {
+               if ( verbose ) PrintAndLog("command execution time out");
+               return 1;
+       }
+       
+       uint8_t isOK = resp.arg[0] & 0xFF;
+       if ( !isOK ) {
+               if ( verbose ) PrintAndLog("legic card select failed");
+               return 1;
+       }
+       
+       legic_card_select_t card;
+       memcpy(&card, (legic_card_select_t *)resp.d.asBytes, sizeof(legic_card_select_t));
+
+       PrintAndLog("  UID : %s", sprint_hex(card.uid, sizeof(card.uid)));
+       switch(card.cardsize) {
+               case 22:
+               case 256: 
+               case 1024:
+                       PrintAndLog(" TYPE : MIM%d card (%d bytes)", card.cardsize, card.cardsize); break;                              
+               default: {
+                       PrintAndLog("Unknown card format: %d", card.cardsize); 
+                       return 1;
+               }
+       }
+       return 0;
+}
+int CmdLegicInfo(const char *Cmd){
+       return HFLegicInfo(Cmd, TRUE);
+}
+       

 static command_t CommandTable[] =  {
        {"help",        CmdHelp,        1, "This help"},
        {"decode",      CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"},
 static command_t CommandTable[] =  {
        {"help",        CmdHelp,        1, "This help"},
        {"decode",      CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"},

-       {"read",        CmdLegicRFRead, 0, "[offset][length] -- read bytes from a LEGIC card"},
+       {"read",        CmdLegicRFRead, 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)"},
        {"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> -- Write sample buffer (user after load or read)"},
-       {"writeRaw",CmdLegicRfRawWrite, 0, "<address> <value> -- Write direct to address"},
+       {"write",       CmdLegicRfWrite,0, "<offset> <length> <iv> -- Write sample buffer (user after load or read)"},
+       {"writeraw",CmdLegicRfRawWrite, 0, "<address> <value> <iv> -- Write direct to address"},

        {"fill",        CmdLegicRfFill, 0, "<offset> <length> <value> -- Fill/Write tag with constant value"},
        {"crc8",        CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"},
        {"fill",        CmdLegicRfFill, 0, "<offset> <length> <value> -- Fill/Write tag with constant value"},
        {"crc8",        CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"},

+       {"info",        CmdLegicInfo, 1, "Information"},

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