github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Funtion unpack moved to table.unpack in LUA 5.3+

Browse source
This commit is contained in:
Jean-Michel Picod 2024-09-20 17:06:25 +02:00
commit d616439618
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/luascripts/hf_mf_keycheck.lua
View file

@ -119,7 +119,7 @@ local function display_results(keys)
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')
for sector = 0, #keys do 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)) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, succA, keyB, succB))
end end
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')
@ -180,7 +180,7 @@ local function dumptofile(uid, keys)
--for sector,_ in pairs(keys) do --for sector,_ in pairs(keys) do
for sector = 0, #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_a = key_a .. bin.pack('H', keyA);
key_b = key_b .. bin.pack('H', keyB); key_b = key_b .. bin.pack('H', keyB);
end end
@ -222,7 +222,7 @@ local function perform_check(uid, numsectors)
local targetblock = tonumber(get_blockno(sector), 16) 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) local keyA = checkBlock(targetblock, keylist, 0)
if keyA then succA = 1; keylist = placeFirst(keyA, keylist) end if keyA then succA = 1; keylist = placeFirst(keyA, keylist) end

4
client/luascripts/hf_mf_uidkeycalc.lua
View file

@ -94,7 +94,7 @@ local function dumptofile(uid, keys)
local key_b = '' local key_b = ''
for sector = 0, #keys do 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_a = key_a .. bin.pack('H', keyA);
key_b = key_b .. bin.pack('H', keyB); key_b = key_b .. bin.pack('H', keyB);
end end
@ -124,7 +124,7 @@ local function printKeys(keys)
print('|sec|key A |res|key B |res|') print('|sec|key A |res|key B |res|')
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')
for sector = 0, #keys do 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)) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, 1, keyB, 1))
end end
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')

5
client/luascripts/hf_mf_uidkeycalc_mizip.lua
View file

@ -97,7 +97,7 @@ local function dumptofile(uid, keys)
local key_b = '' local key_b = ''
for sector = 0, #keys do 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_a = key_a .. bin.pack('H', keyA);
key_b = key_b .. bin.pack('H', keyB); key_b = key_b .. bin.pack('H', keyB);
end end
@ -115,6 +115,7 @@ end
-- create key -- create key
local function calckey(uid, xorkey, keytype) local function calckey(uid, xorkey, keytype)
local p1,p2,p3,p4,p5,p6 local p1,p2,p3,p4,p5,p6
print("calckey()")
if keytype == 'A' then if keytype == 'A' then
p1 = bxor( uid[1], xorkey[1]) p1 = bxor( uid[1], xorkey[1])
p2 = bxor( uid[2], xorkey[2]) p2 = bxor( uid[2], xorkey[2])
@ -139,7 +140,7 @@ local function printKeys(keys)
print('|sec|key A |res|key B |res|') print('|sec|key A |res|key B |res|')
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')
for sector = 0, #keys do 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)) print(('|%03d| %s | %s | %s | %s |'):format(sector, keyA, 1, keyB, 1))
end end
print('|---|----------------|---|----------------|---|') print('|---|----------------|---|----------------|---|')