From d616439618f5a5229cb86583ee5d0c7ee0409171 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Fri, 20 Sep 2024 17:06:25 +0200 Subject: [PATCH] Funtion unpack moved to table.unpack in LUA 5.3+ --- client/luascripts/hf_mf_keycheck.lua | 6 +++--- client/luascripts/hf_mf_uidkeycalc.lua | 4 ++-- client/luascripts/hf_mf_uidkeycalc_mizip.lua | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/luascripts/hf_mf_keycheck.lua b/client/luascripts/hf_mf_keycheck.lua index 59680cbe4..1ed663121 100644 --- a/client/luascripts/hf_mf_keycheck.lua +++ b/client/luascripts/hf_mf_keycheck.lua @@ -119,7 +119,7 @@ local function display_results(keys) print('|---|----------------|---|----------------|---|') for sector = 0, #keys do - succA, succB, keyA, keyB = unpack(keys[sector]) + succA, succB, keyA, keyB = table.unpack(keys[sector]) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, succA, keyB, succB)) end print('|---|----------------|---|----------------|---|') @@ -180,7 +180,7 @@ local function dumptofile(uid, keys) --for sector,_ in pairs(keys) do for sector = 0, #keys do - local succA, succB, keyA, keyB = unpack(keys[sector]) + local succA, succB, keyA, keyB = table.unpack(keys[sector]) key_a = key_a .. bin.pack('H', keyA); key_b = key_b .. bin.pack('H', keyB); end @@ -222,7 +222,7 @@ local function perform_check(uid, numsectors) local targetblock = tonumber(get_blockno(sector), 16) - local succA, succB, keyA, keyB = unpack(keys[sector]) + local succA, succB, keyA, keyB = table.unpack(keys[sector]) local keyA = checkBlock(targetblock, keylist, 0) if keyA then succA = 1; keylist = placeFirst(keyA, keylist) end diff --git a/client/luascripts/hf_mf_uidkeycalc.lua b/client/luascripts/hf_mf_uidkeycalc.lua index 88330ae85..dd2ca6c3a 100644 --- a/client/luascripts/hf_mf_uidkeycalc.lua +++ b/client/luascripts/hf_mf_uidkeycalc.lua @@ -94,7 +94,7 @@ local function dumptofile(uid, keys) local key_b = '' for sector = 0, #keys do - local keyA, keyB = unpack(keys[sector]) + local keyA, keyB = table.unpack(keys[sector]) key_a = key_a .. bin.pack('H', keyA); key_b = key_b .. bin.pack('H', keyB); end @@ -124,7 +124,7 @@ local function printKeys(keys) print('|sec|key A |res|key B |res|') print('|---|----------------|---|----------------|---|') for sector = 0, #keys do - local keyA, keyB = unpack(keys[sector]) + local keyA, keyB = table.unpack(keys[sector]) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, 1, keyB, 1)) end print('|---|----------------|---|----------------|---|') diff --git a/client/luascripts/hf_mf_uidkeycalc_mizip.lua b/client/luascripts/hf_mf_uidkeycalc_mizip.lua index 902aeeda8..b2a0992d5 100644 --- a/client/luascripts/hf_mf_uidkeycalc_mizip.lua +++ b/client/luascripts/hf_mf_uidkeycalc_mizip.lua @@ -97,7 +97,7 @@ local function dumptofile(uid, keys) local key_b = '' for sector = 0, #keys do - local keyA, keyB = unpack(keys[sector]) + local keyA, keyB = table.unpack(keys[sector]) key_a = key_a .. bin.pack('H', keyA); key_b = key_b .. bin.pack('H', keyB); end @@ -115,6 +115,7 @@ end -- create key local function calckey(uid, xorkey, keytype) local p1,p2,p3,p4,p5,p6 + print("calckey()") if keytype == 'A' then p1 = bxor( uid[1], xorkey[1]) p2 = bxor( uid[2], xorkey[2]) @@ -139,7 +140,7 @@ local function printKeys(keys) print('|sec|key A |res|key B |res|') print('|---|----------------|---|----------------|---|') for sector = 0, #keys do - local keyA, keyB = unpack(keys[sector]) + local keyA, keyB = table.unpack(keys[sector]) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, 1, keyB, 1)) end print('|---|----------------|---|----------------|---|')