mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-02-23 18:27:28 -08:00
Fix typo in lua scripts: 1443a -> 14443a.
This commit is contained in:
parent
fb69dd881a
commit
e98389b355
@ -2,7 +2,7 @@
|
||||
This is a library to read 14443a tags. It can be used something like this
|
||||
|
||||
local reader = require('read14a')
|
||||
result, err = reader.read1443a()
|
||||
result, err = reader.read14443a()
|
||||
if not result then
|
||||
print(err)
|
||||
return
|
||||
@ -26,7 +26,7 @@ local ISO14A_COMMAND = {
|
||||
ISO14A_NO_RATS = 0x200
|
||||
}
|
||||
|
||||
local ISO14443a_TYPES = {}
|
||||
local ISO14443a_TYPES = {}
|
||||
ISO14443a_TYPES[0x00] = "NXP MIFARE Ultralight | Ultralight C"
|
||||
ISO14443a_TYPES[0x01] = "NXP MIFARE TNP3xxx Activision Game Appliance"
|
||||
ISO14443a_TYPES[0x04] = "NXP MIFARE (various !DESFire !DESFire EV1)"
|
||||
@ -43,14 +43,14 @@ ISO14443a_TYPES[0x88] = "Infineon MIFARE CLASSIC 1K"
|
||||
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)
|
||||
end
|
||||
|
||||
local function parse1443a(data)
|
||||
local function parse14443a(data)
|
||||
--[[
|
||||
|
||||
Based on this struct :
|
||||
Based on this struct :
|
||||
|
||||
typedef struct {
|
||||
byte_t uid[10];
|
||||
@ -66,14 +66,14 @@ local function parse1443a(data)
|
||||
local count,uid,uidlen, atqa, sak, ats_len, ats= bin.unpack('H10CH2CC',data)
|
||||
uid = uid:sub(1,2*uidlen)
|
||||
--print("uid, atqa, sak: ",uid, atqa, sak)
|
||||
--print("TYPE: ", tostring_1443a(sak))
|
||||
return { uid = uid, atqa = atqa, sak = sak, name = tostring_1443a(sak)}
|
||||
--print("TYPE: ", tostring_14443a(sak))
|
||||
return { uid = uid, atqa = atqa, sak = sak, name = tostring_14443a(sak)}
|
||||
end
|
||||
|
||||
--- Sends a USBpacket to the device
|
||||
-- @param command - the usb packet to send
|
||||
-- @param ignoreresponse - if set to true, we don't read the device answer packet
|
||||
-- which is usually recipe for fail. If not sent, the host will wait 2s for a
|
||||
-- @param ignoreresponse - if set to true, we don't read the device answer packet
|
||||
-- which is usually recipe for fail. If not sent, the host will wait 2s for a
|
||||
-- response of type CMD_ACK
|
||||
-- @return packet,nil if successfull
|
||||
-- nil, errormessage if unsuccessfull
|
||||
@ -99,7 +99,7 @@ end
|
||||
local function read14443a(dont_disconnect, no_rats)
|
||||
local command, result, info, err, data
|
||||
|
||||
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
|
||||
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
|
||||
arg1 = ISO14A_COMMAND.ISO14A_CONNECT}
|
||||
if dont_disconnect then
|
||||
command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
|
||||
@ -110,24 +110,24 @@ local function read14443a(dont_disconnect, no_rats)
|
||||
local result,err = sendToDevice(command)
|
||||
if result then
|
||||
local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
|
||||
if arg0 == 0 then
|
||||
if arg0 == 0 then
|
||||
return nil, "iso14443a card select failed"
|
||||
end
|
||||
data = string.sub(result,count)
|
||||
info, err = parse1443a(data)
|
||||
info, err = parse14443a(data)
|
||||
else
|
||||
err ="No response from card"
|
||||
end
|
||||
|
||||
if err then
|
||||
print(err)
|
||||
if err then
|
||||
print(err)
|
||||
return nil, err
|
||||
end
|
||||
return info
|
||||
end
|
||||
|
||||
---
|
||||
-- Waits for a mifare card to be placed within the vicinity of the reader.
|
||||
-- Waits for a mifare card to be placed within the vicinity of the reader.
|
||||
-- @return if successfull: an table containing card info
|
||||
-- @return if unsuccessfull : nil, error
|
||||
local function waitFor14443a()
|
||||
@ -139,14 +139,14 @@ local function waitFor14443a()
|
||||
end
|
||||
return nil, "Aborted by user"
|
||||
end
|
||||
|
||||
local library = {
|
||||
|
||||
read1443a = read14443a,
|
||||
read = read14443a,
|
||||
read14443a = read14443a,
|
||||
read = read14443a,
|
||||
waitFor14443a = waitFor14443a,
|
||||
parse1443a = parse1443a,
|
||||
parse14443a = parse14443a,
|
||||
sendToDevice = sendToDevice,
|
||||
ISO14A_COMMAND = ISO14A_COMMAND,
|
||||
}
|
||||
|
||||
return library
|
||||
return library
|
||||
|
@ -106,7 +106,7 @@ function main(args)
|
||||
dbg("doconnect")
|
||||
-- We reuse the connect functionality from a
|
||||
-- common library
|
||||
info, err = lib14a.read1443a(true, no_rats)
|
||||
info, err = lib14a.read14443a(true, no_rats)
|
||||
|
||||
if err then return oops(err) end
|
||||
print(("Connected to card, uid = %s"):format(info.uid))
|
||||
|
@ -406,7 +406,7 @@ function main(args)
|
||||
|
||||
-- GET TAG UID
|
||||
|
||||
result, err = lib14a.read1443a(false, true)
|
||||
result, err = lib14a.read14443a(false, true)
|
||||
if not result then
|
||||
return oops(err)
|
||||
end
|
||||
|
@ -71,7 +71,7 @@ end
|
||||
--
|
||||
-- Read information from a card
|
||||
function GetCardInfo()
|
||||
result, err = lib14a.read1443a(false, true)
|
||||
result, err = lib14a.read14443a(false, true)
|
||||
if not result then
|
||||
print(err)
|
||||
return
|
||||
|
@ -170,7 +170,7 @@ local function main( args)
|
||||
|
||||
print(desc);
|
||||
|
||||
result, err = reader.read1443a(false, true)
|
||||
result, err = reader.read14443a(false, true)
|
||||
if not result then
|
||||
print(err)
|
||||
return
|
||||
|
@ -56,7 +56,7 @@ end
|
||||
-- @return if unsuccessfull : nil, error
|
||||
function wait_for_mifare()
|
||||
while not core.ukbhit() do
|
||||
res, err = reader.read1443a(false, true)
|
||||
res, err = reader.read14443a(false, true)
|
||||
if res then return res end
|
||||
-- err means that there was no response from card
|
||||
end
|
||||
|
@ -122,7 +122,7 @@ local function main(args)
|
||||
|
||||
|
||||
-- find tag
|
||||
result, err = lib14a.read1443a(false, true)
|
||||
result, err = lib14a.read14443a(false, true)
|
||||
if not result then return oops(err) end
|
||||
|
||||
-- load keys
|
||||
|
@ -127,7 +127,7 @@ local function main(args)
|
||||
local cmdSetDbgOff = "hf mf dbg 0"
|
||||
core.console( cmdSetDbgOff)
|
||||
|
||||
result, err = lib14a.read1443a(false, true)
|
||||
result, err = lib14a.read14443a(false, true)
|
||||
if not result then
|
||||
return oops(err)
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user