github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-31 03:50:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo in lua scripts: 1443a -> 14443a.

Browse source
This commit is contained in:
Arnie97 2018-01-25 13:43:01 +08:00
parent fb69dd881a
commit e98389b355
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/lualibs/read14a.lua
View file

@ -2,7 +2,7 @@
This is a library to read 14443a tags. It can be used something like this This is a library to read 14443a tags. It can be used something like this
local reader = require('read14a') local reader = require('read14a')
result, err = reader.read1443a() result, err = reader.read14443a()
if not result then if not result then
print(err) print(err)
return return
@ -43,11 +43,11 @@ ISO14443a_TYPES[0x88] = "Infineon MIFARE CLASSIC 1K"
ISO14443a_TYPES[0x98] = "Gemplus MPCOS" ISO14443a_TYPES[0x98] = "Gemplus MPCOS"
local function tostring_1443a(sak) local function tostring_14443a(sak)
return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak) return ISO14443a_TYPES[sak] or ("Unknown (SAK=%x)"):format(sak)
end end
local function parse1443a(data) local function parse14443a(data)
--[[ --[[
Based on this struct : Based on this struct :
@ -66,8 +66,8 @@ local function parse1443a(data)
local count,uid,uidlen, atqa, sak, ats_len, ats= bin.unpack('H10CH2CC',data) local count,uid,uidlen, atqa, sak, ats_len, ats= bin.unpack('H10CH2CC',data)
uid = uid:sub(1,2*uidlen) uid = uid:sub(1,2*uidlen)
--print("uid, atqa, sak: ",uid, atqa, sak) --print("uid, atqa, sak: ",uid, atqa, sak)
--print("TYPE: ", tostring_1443a(sak)) --print("TYPE: ", tostring_14443a(sak))
return { uid = uid, atqa = atqa, sak = sak, name = tostring_1443a(sak)} return { uid = uid, atqa = atqa, sak = sak, name = tostring_14443a(sak)}
end end
--- Sends a USBpacket to the device --- Sends a USBpacket to the device
@ -114,7 +114,7 @@ local function read14443a(dont_disconnect, no_rats)
return nil, "iso14443a card select failed" return nil, "iso14443a card select failed"
end end
data = string.sub(result,count) data = string.sub(result,count)
info, err = parse1443a(data) info, err = parse14443a(data)
else else
err ="No response from card" err ="No response from card"
end end
@ -139,12 +139,12 @@ local function waitFor14443a()
end end
return nil, "Aborted by user" return nil, "Aborted by user"
end end
local library = {
read1443a = read14443a, local library = {
read14443a = read14443a,
read = read14443a, read = read14443a,
waitFor14443a = waitFor14443a, waitFor14443a = waitFor14443a,
parse1443a = parse1443a, parse14443a = parse14443a,
sendToDevice = sendToDevice, sendToDevice = sendToDevice,
ISO14A_COMMAND = ISO14A_COMMAND, ISO14A_COMMAND = ISO14A_COMMAND,
} }

2
client/scripts/14araw.lua
View file

@ -106,7 +106,7 @@ function main(args)
dbg("doconnect") dbg("doconnect")
-- We reuse the connect functionality from a -- We reuse the connect functionality from a
-- common library -- common library
info, err = lib14a.read1443a(true, no_rats) info, err = lib14a.read14443a(true, no_rats)
if err then return oops(err) end if err then return oops(err) end
print(("Connected to card, uid = %s"):format(info.uid)) print(("Connected to card, uid = %s"):format(info.uid))

2
client/scripts/didump.lua
View file

@ -406,7 +406,7 @@ function main(args)
-- GET TAG UID -- GET TAG UID
result, err = lib14a.read1443a(false, true) result, err = lib14a.read14443a(false, true)
if not result then if not result then
return oops(err) return oops(err)
end end

2
client/scripts/formatMifare.lua
View file

@ -71,7 +71,7 @@ end
-- --
-- Read information from a card -- Read information from a card
function GetCardInfo() function GetCardInfo()
result, err = lib14a.read1443a(false, true) result, err = lib14a.read14443a(false, true)
if not result then if not result then
print(err) print(err)
return return

2
client/scripts/mfkeys.lua
View file

@ -170,7 +170,7 @@ local function main( args)
print(desc); print(desc);
result, err = reader.read1443a(false, true) result, err = reader.read14443a(false, true)
if not result then if not result then
print(err) print(err)
return return

2
client/scripts/mifare_autopwn.lua
View file

@ -56,7 +56,7 @@ end
-- @return if unsuccessfull : nil, error -- @return if unsuccessfull : nil, error
function wait_for_mifare() function wait_for_mifare()
while not core.ukbhit() do while not core.ukbhit() do
res, err = reader.read1443a(false, true) res, err = reader.read14443a(false, true)
if res then return res end if res then return res end
-- err means that there was no response from card -- err means that there was no response from card
end end

2
client/scripts/tnp3clone.lua
View file

@ -122,7 +122,7 @@ local function main(args)
-- find tag -- find tag
result, err = lib14a.read1443a(false, true) result, err = lib14a.read14443a(false, true)
if not result then return oops(err) end if not result then return oops(err) end
-- load keys -- load keys

2
client/scripts/tnp3dump.lua
View file

@ -127,7 +127,7 @@ local function main(args)
local cmdSetDbgOff = "hf mf dbg 0" local cmdSetDbgOff = "hf mf dbg 0"
core.console( cmdSetDbgOff) core.console( cmdSetDbgOff)
result, err = lib14a.read1443a(false, true) result, err = lib14a.read14443a(false, true)
if not result then if not result then
return oops(err) return oops(err)
end end