rfidrig/proxmark3
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-12 11:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Funtion unpack moved to table.unpack in LUA 5.3+

Browse Source
This commit is contained in:
Jean-Michel Picod
2024-09-20 17:21:17 +02:00
parent 0421f5fde5
commit d616439618
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/luascripts/hf_mf_keycheck.lua
+3 -3
View File
@@ -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
client/luascripts/hf_mf_uidkeycalc.lua
+2 -2
View File
@@ -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('|---|----------------|---|----------------|---|')
client/luascripts/hf_mf_uidkeycalc_mizip.lua
+3 -2
View File
@@ -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('|---|----------------|---|----------------|---|')