This commit is contained in:
Philippe Teuwen 2019-08-04 12:58:36 +02:00
commit 88d2a61c0b
3 changed files with 5 additions and 5 deletions

View file

@ -303,7 +303,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added to proxmark command line parameters `c` and `l` - execute command and lua script from command line (@merlokk) - Added to proxmark command line parameters `c` and `l` - execute command and lua script from command line (@merlokk)
- Added to proxmark ability to execute commands from stdin (pipe) (@merlokk) - Added to proxmark ability to execute commands from stdin (pipe) (@merlokk)
- Added new standalone mode "HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN" (@cjbrigato) - Added new standalone mode "HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN" (@cjbrigato)
- Added to `hf 14a apdu` - exchange apdu via iso1443-4 (@merlokk) - Added to `hf 14a apdu` - exchange apdu via iso14443-4 (@merlokk)
- Added to `hf 14a apdu` - apdu and tlv results parser (@merlokk) - Added to `hf 14a apdu` - apdu and tlv results parser (@merlokk)
- Added `hf emv` commands (@merlokk) - Added `hf emv` commands (@merlokk)
- lots of bug fixes (many many) - lots of bug fixes (many many)

View file

@ -28,7 +28,7 @@ local ISO14B_COMMAND = {
ISO14B_SELECT_SR = 0x80, ISO14B_SELECT_SR = 0x80,
} }
local function parse1443b(data) local function parse14443b(data)
--[[ --[[
Based on this struct : Based on this struct :
@ -79,7 +79,7 @@ local function read14443b(disconnect)
local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result) local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
if arg0 == 0 then if arg0 == 0 then
data = string.sub(result, count) data = string.sub(result, count)
info, err = parse1443b(data) info, err = parse14443b(data)
else else
err = 'iso14443b card select failed' err = 'iso14443b card select failed'
end end
@ -126,7 +126,7 @@ end
local library = { local library = {
read = read14443b, read = read14443b,
waitFor14443b = waitFor14443b, waitFor14443b = waitFor14443b,
parse1443b = parse1443b, parse14443b = parse14443b,
connect = connect14443b, connect = connect14443b,
disconnect = disconnect14443b, disconnect = disconnect14443b,
ISO14B_COMMAND = ISO14B_COMMAND, ISO14B_COMMAND = ISO14B_COMMAND,

View file

@ -205,7 +205,7 @@ local function main(args)
return return
end end
parsed_tag = reader.parse1443a(tag) parsed_tag = reader.parse14443a(tag)
print('Tag type:', parsed_tag.name) print('Tag type:', parsed_tag.name)
print('Tag UID:', parsed_tag.uid) print('Tag UID:', parsed_tag.uid)
print('Tag len:', tag:len()) print('Tag len:', tag:len())