Merge pull request #1128 from tcprst/legic_cliparser

hf legic crc, rdbl, wrbl, sim, info, reader - now use cliparser

client/luascripts/hf_legic.lua

@@ -582,14 +582,14 @@ function writeToTag(tag)
         -- write pm3-buffer to Tag
         for i=1, WriteBytes do
             if (i > 7) then
-                cmd = ("hf legic wrbl o %02x d %s "):format(i-1, padString(bytes[i]))
+                cmd = ("hf legic wrbl -o %d -d %s "):format(i-1, padString(bytes[i]))
                 print(acgreen..cmd..acoff)
                 core.console(cmd)
                 core.clearCommandBuffer()
             elseif (i == 7) then
                 if (writeDCF) then
                     -- write DCF in reverse order (requires 'mosci-patch')
-                    cmd = ('hf legic wrbl o 05 d %s%s'):format(padString(bytes[i-1]), padString(bytes[i]))
+                    cmd = ('hf legic wrbl -o 5 -d %s%s'):format(padString(bytes[i-1]), padString(bytes[i]))
                     print(acgreen..cmd..acoff)
                     core.console(cmd)
                     core.clearCommandBuffer()

client/luascripts/hf_legic_clone.lua

@@ -536,7 +536,7 @@ local function main(args)
                 res = res .."\n\na segmentCRC gets calculated over MCD,MSN0..3, Segment-Header0..3"
                 res = res .."\ne.g. (based on Segment00 of the data from "..infile.."):"
                 res = res .."\n"
-                res = res ..ansicolors.yellow.."hf legic crc d "..bytes[1]..bytes[2]..bytes[3]..bytes[4]..bytes[23]..bytes[24]..bytes[25]..bytes[26].." u "..newcrc.." c 8"..ansicolors.reset
+                res = res ..ansicolors.yellow.."hf legic crc -d "..bytes[1]..bytes[2]..bytes[3]..bytes[4]..bytes[23]..bytes[24]..bytes[25]..bytes[26].." --mcc "..newcrc.." -t 8"..ansicolors.reset
                 -- this can not be calculated without knowing the new MCD, MSN0..2
                 print(res)
             end

client/src/cmdhf.c

@@ -109,7 +109,7 @@ int CmdHFSearch(const char *Cmd) {
     PROMPT_CLEARLINE;
     PrintAndLogEx(INPLACE, " Searching for LEGIC tag...");
     if (IfPm3Legicrf()) {
-        if (readLegicUid(false) == PM3_SUCCESS) {
+        if (readLegicUid(false, false) == PM3_SUCCESS) {
             PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("LEGIC Prime tag") " found\n");
             res = PM3_SUCCESS;
         }

client/src/cmdhflegic.h

@@ -17,7 +17,7 @@
 
 int CmdHFLegic(const char *Cmd);
 
-int readLegicUid(bool verbose);
+int readLegicUid(bool loop, bool verbose);
 int legic_print_type(uint32_t tagtype, uint8_t spaces);
 int legic_get_type(legic_card_select_t *card);
 void legic_chk_iv(uint32_t *iv);

doc/cliparser_todo.txt

@@ -74,14 +74,8 @@ hf felica resetmode
 hf felica litesim
 hf felica litedump
 hf fido info
-hf legic reader
-hf legic info
 hf legic dump
 hf legic restore
-hf legic rdbl
-hf legic sim
-hf legic wrbl
-hf legic crc
 hf legic eload
 hf legic esave
 hf legic wipe