CHG: code clean up

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 5bfa9eaf8fa6c725be86f52352859819ee1dccab..6b880da69281c7bf20df0a4ddb463cd306b7ebbb 100644 (file)
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -44,13 +44,14 @@ int usage_legic_read(void){
        PrintAndLog("Usage:  hf legic read [h] <offset> <length> <IV>");
        PrintAndLog("Options:");
        PrintAndLog("  h             : this help");
        PrintAndLog("Usage:  hf legic read [h] <offset> <length> <IV>");
        PrintAndLog("Options:");
        PrintAndLog("  h             : this help");

-       PrintAndLog("  <offset>      : offset in data array to start download from");
-       PrintAndLog("  <length>      : number of bytes to download");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
+       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 10 4");
+       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){
        return 0;
 }
 int usage_legic_sim(void){


@@ -62,27 +63,25 @@ int usage_legic_write(void){
        PrintAndLog("Usage:  hf legic write [h] <offset> <length> <IV>");
        PrintAndLog("Options:");
        PrintAndLog("  h             : this help");
        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");
-       PrintAndLog("  <length>      : number of bytes to write");
+       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("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
        PrintAndLog("");
        PrintAndLog("Samples:");

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

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

-       PrintAndLog("Write raw data direct to a specific address on legic tag.");
-       PrintAndLog("Usage:  hf legic writeraw [h] <address> <value> <IV>");
+       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("Options:");
        PrintAndLog("  h             : this help");

-       PrintAndLog("  <address>     : address to write to");
-       PrintAndLog("  <value>       : value to write");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
+       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("");
        PrintAndLog("Samples:");

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

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


@@ -109,86 +108,86 @@ int CmdLegicDecode(const char *Cmd) {
        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;
        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 data_buf[1024]; // receiver buffer
+       uint8_t data[1024]; // receiver buffer

        char token_type[5] = {0,0,0,0,0};
        int dcf = 0;
        int bIsSegmented = 0;
 
        char token_type[5] = {0,0,0,0,0};
        int dcf = 0;
        int bIsSegmented = 0;
 

-       // copy data from proxmark into buffer
-       GetFromBigBuf(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) {
+                       switch (data[5] & 0x7f) {

                        case 0x00 ... 0x2f:
                                strncpy(token_type, "IAM", sizeof(token_type));
                        case 0x00 ... 0x2f:
                                strncpy(token_type, "IAM", sizeof(token_type));

-                               fl = (0x2f - (data_buf[5] & 0x7f)) + 1;
+                               fl = (0x2f - (data[5] & 0x7f)) + 1;

                                break;
                        case 0x30 ... 0x6f:
                                strncpy(token_type, "SAM", sizeof(token_type));
                                break;
                        case 0x30 ... 0x6f:
                                strncpy(token_type, "SAM", sizeof(token_type));

-                               fl = (0x6f - (data_buf[5] & 0x7f)) + 1;
+                               fl = (0x6f - (data[5] & 0x7f)) + 1;

                                break;
                        case 0x70 ... 0x7f:
                                strncpy(token_type, "GAM", sizeof(token_type));
                                break;
                        case 0x70 ... 0x7f:
                                strncpy(token_type, "GAM", sizeof(token_type));

-                               fl = (0x7f - (data_buf[5] & 0x7f)) + 1;
+                               fl = (0x7f - (data[5] & 0x7f)) + 1;

                                break;
                        }
 
                                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],
+                       data[5],
+                       data[6],

                        token_type,
                        token_type,

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

                        stamp_len,
                        fl
                );
 
        } else {        // Is IM(-S) type of card...
 
                        stamp_len,
                        fl
                );
 
        } 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 {


@@ -197,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

                );
        }
 
                );
        }
 


@@ -209,10 +208,10 @@ 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]

                        );
                }
 
                        );
                }
 


@@ -220,10 +219,10 @@ int CmdLegicDecode(const char *Cmd) {
                if(bIsSegmented || dcf > 60000) {
                        if(dcf > 60000) {
                                PrintAndLog("Master token data");
                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 {
                                PrintAndLog("Remaining Header Area");
                        } else {
                                PrintAndLog("Remaining Header Area");

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

                        }
                }
        }
                        }
                }
        }


@@ -246,10 +245,10 @@ int CmdLegicDecode(const char *Cmd) {
                        // 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;
+                               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);
 
                                bool hasWRC = (wrc > 0);
                                bool hasWRP = (wrp > wrc);


@@ -257,31 +256,31 @@ int CmdLegicDecode(const char *Cmd) {
                                int remain_seg_payload_len = (segment_len - wrp - 5);
                
                                // validate segment-crc
                                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
+                               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);
 
                                segCalcCRC = CRC8Legic(segCrcBytes, 8);

-                               segCRC = data_buf[i+4] ^ crc;
+                               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,
 
                                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,
+                                       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,
                                        segment_len, 
                                        segment_flag,
                                        (segment_flag & 0x4) >> 2,
                                        (segment_flag & 0x8) >> 3,
                                        wrp,
                                        wrc,

-                                       ((data_buf[i+3]^crc) & 0x80) >> 7,
+                                       ((data[i+3]^crc) & 0x80) >> 7,

                                        segCRC,
                                        ( segCRC == segCalcCRC ) ? "OK" : "fail"
                                );
                                        segCRC,
                                        ( segCRC == segCalcCRC ) ? "OK" : "fail"
                                );


@@ -294,9 +293,9 @@ int CmdLegicDecode(const char *Cmd) {
                                        PrintAndLog("-----+------------------------------------------------");
 
                                        for ( k=i; k < (i + wrc); ++k)
                                        PrintAndLog("-----+------------------------------------------------");
 
                                        for ( k=i; k < (i + wrc); ++k)

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

 
 

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

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


@@ -307,15 +306,15 @@ int CmdLegicDecode(const char *Cmd) {
                                        PrintAndLog("-----+------------------------------------------------");
 
                                        for (k=i; k < (i+wrp_len); ++k)
                                        PrintAndLog("-----+------------------------------------------------");
 
                                        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;
                        
                                        // 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]^crc, data_buf[i-3]^crc, data_buf[i-2]^crc);                   
+                                               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("Remaining segment payload:  (I %d | K %d | Remain LEN %d)", i, k, remain_seg_payload_len);


@@ -323,9 +322,9 @@ int CmdLegicDecode(const char *Cmd) {
                                PrintAndLog("-----+------------------------------------------------");
 
                                for ( k=i; k < (i+remain_seg_payload_len); ++k)
                                PrintAndLog("-----+------------------------------------------------");
 
                                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;
                


@@ -341,8 +340,8 @@ int CmdLegicDecode(const char *Cmd) {
                        // Data start point on unsegmented cards
                        i = 8;
 
                        // Data start point on unsegmented cards
                        i = 8;
 

-                       wrp = data_buf[7] & 0x0F;
-                       wrc = (data_buf[7] & 0x70) >> 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);


@@ -352,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;
                        }
     


@@ -367,18 +366,18 @@ 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");


@@ -401,7 +400,7 @@ int CmdLegicRFRead(const char *Cmd) {
        // OUT-OF-BOUNDS check
        if ( len + offset > MAX_LENGTH ) {
                len = MAX_LENGTH - offset;
        // OUT-OF-BOUNDS check
        if ( len + offset > MAX_LENGTH ) {
                len = MAX_LENGTH - offset;

-               PrintAndLog("Out-of-bound, shorten len to %d", len);
+               PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len, len);

        }
        
        if ( (IV & 0x7F) != IV ){
        }
        
        if ( (IV & 0x7F) != IV ){


@@ -413,35 +412,37 @@ int CmdLegicRFRead(const char *Cmd) {
                IV |= 0x01;
                PrintAndLog("LSB of IV must be SET");   
        }
                IV |= 0x01;
                PrintAndLog("LSB of IV must be SET");   
        }

-
-       //PrintAndLog("Using IV: 0x%02x", IV);

        
        UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;
        
        UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand resp;

-       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 3000)) {

                uint8_t isOK = resp.arg[0] & 0xFF;
                uint8_t isOK = resp.arg[0] & 0xFF;

-               uint16_t len = resp.arg[1] & 0x3FF;
+               uint16_t readlen = resp.arg[1];

                 if ( isOK ) {
 
                 if ( isOK ) {
 

-                       uint8_t *data = malloc(len);
+                       uint8_t *data = malloc(readlen);

                        if ( !data ){
                                PrintAndLog("Cannot allocate memory");
                                return 2;
                        }
                        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
                        // copy data from device

-                       GetEMLFromBigBuf(data, len, 0);
-                       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
+                       GetEMLFromBigBuf(data, readlen, 0);
+                       if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)){

                                PrintAndLog("Command execute timeout");
                                if ( data ) 
                                        free(data);
                                return 1;
                        }
        
                                PrintAndLog("Command execute timeout");
                                if ( data ) 
                                        free(data);
                                return 1;
                        }
        

-                       PrintAndLog("\nData");
-                       PrintAndLog("-----------------------------");
-                       print_hex_break( data, len, 32);
+                       PrintAndLog("\n ##  | Data");
+                       PrintAndLog("-----+-----");
+                       print_hex_break( data, readlen, 32);

                 } else {
                         PrintAndLog("failed reading tag");
                 }
                 } else {
                         PrintAndLog("failed reading tag");
                 }


@@ -604,7 +605,6 @@ int CmdLegicRfWrite(const char *Cmd) {
        
        uint32_t offset = 0, len = 0, IV = 0;
        
        
        uint32_t offset = 0, len = 0, IV = 0;
        

-    UsbCommand c = {CMD_WRITER_LEGIC_RF, {0,0,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");
     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");


@@ -612,8 +612,10 @@ int CmdLegicRfWrite(const char *Cmd) {
     }
 
        // OUT-OF-BOUNDS check
     }
 
        // OUT-OF-BOUNDS check

-       if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset;
-
+       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 & 0x7F) != IV ){
                IV &= 0x7F;
                PrintAndLog("Truncating IV to 7bits");


@@ -623,14 +625,21 @@ int CmdLegicRfWrite(const char *Cmd) {
                PrintAndLog("LSB of IV must be SET");   
        }
        
                PrintAndLog("LSB of IV must be SET");   
        }
        

-       PrintAndLog("Current IV: 0x%02x", IV);
-       
-       c.arg[0] = offset;
-       c.arg[1] = len;
-    c.arg[2] = IV;
-       
+    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;
 }
 


@@ -639,17 +648,18 @@ int CmdLegicRfRawWrite(const char *Cmd) {
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rawwrite();
        
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rawwrite();
        

-       uint32_t address = 0, data = 0, IV = 0; 
+       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, "%x %x %x", &address, &data, &IV);
+    int res = sscanf(Cmd, "%x %x %x", &offset, &data, &IV);

        if(res < 2)
                return usage_legic_rawwrite();
        if(res < 2)
                return usage_legic_rawwrite();

-
+       

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

-       if(address > MAX_LENGTH)
-               return usage_legic_rawwrite();
+       if ( offset > MAX_LENGTH ) {
+               PrintAndLog("Out-of-bound, offset");
+               return 1;
+       }

        
        if ( (IV & 0x7F) != IV ){
                IV &= 0x7F;
        
        if ( (IV & 0x7F) != IV ){
                IV &= 0x7F;


@@ -659,11 +669,8 @@ int CmdLegicRfRawWrite(const char *Cmd) {
                IV |= 0x01;  // IV must be odd
                PrintAndLog("LSB of IV must be SET");   
        }
                IV |= 0x01;  // IV must be odd
                PrintAndLog("LSB of IV must be SET");   
        }

-       PrintAndLog("Current IV: 0x%02x", IV);

 
 

-       c.arg[0] = address;
-       c.arg[1] = data;
-    c.arg[2] = IV;
+       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 !! #############");