Merge pull request #2663 from douniwan5788/fix_concatbits_again

fix Hitag S concatbits and `lf em 410x clone --hts`

Author: iceman1001

client/src/cmdlfem410x.c

@@ -732,6 +732,7 @@ static int CmdEM410xClone(const char *Cmd) {
 
             packet.cmd = HTSF_82xx;
             memcpy(packet.pwd, "\xBB\xDD\x33\x99", HITAGS_PAGE_SIZE);
+            packet.mode = HITAGS_UID_REQ_FADV;
             SendCommandNG(CMD_LF_HITAGS_WRITE, (uint8_t *)&packet, sizeof(packet));
             if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 4000) == false) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");

common/commonutil.c

@@ -554,8 +554,8 @@ size_t concatbits(uint8_t *dest, int dest_offset, const uint8_t *src, int src_of
         end = nbits;
         step = 1;
     } else {
-        i = nbits;
-        end = 0;
+        i = nbits - 1;
+        end = -1;
         step = -1;
     }
 

include/hitag.h

@@ -161,7 +161,7 @@ typedef struct {
     uint8_t logdata_1[4];
     uint8_t nonce[4];
 
-    //Hitag s section
+    // Hitag S section
     uint8_t mode;
 } PACKED lf_hitag_data_t;