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

increased a number of calypso commands for selecting files and trying to read them

Browse source
This commit is contained in:
iceman1001 2016-03-20 21:30:40 +01:00
commit 4bf0f73d76
2 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/lualibs/read14b.lua
View file

@ -13,7 +13,7 @@
-- Loads the commands-library -- Loads the commands-library
local cmds = require('commands') local cmds = require('commands')
local utils = require('utils') local utils = require('utils')
local TIMEOUT = 4000 local TIMEOUT = 2000
local ISO14B_COMMAND = { local ISO14B_COMMAND = {
ISO14B_CONNECT = 1, ISO14B_CONNECT = 1,
ISO14B_DISCONNECT = 2, ISO14B_DISCONNECT = 2,

55
client/scripts/calypso.lua
View file

@ -149,33 +149,37 @@ end
local function calypso_apdu_status(apdu) local function calypso_apdu_status(apdu)
-- last two is CRC -- last two is CRC
-- next two is APDU status bytes. -- next two is APDU status bytes.
local status = false
local mess = 'FAIL'
local sw = apdu:sub( #apdu-7, #apdu-4) local sw = apdu:sub( #apdu-7, #apdu-4)
print ('SW', sw ) if sw == '9000' then
-- if 0x9000 OK mess = 'OK'
if sw == '9000' then return 1 end status = true
return 0 end
print ('SW', sw, mess )
return status
end end
local _calypso_cmds = { local _calypso_cmds = {
["1.Select ICC file"] = "02 94 a4 08 00 04 3f 00 00 02", ["01.Select ICC file"] = '02 94 a4 08 00 04 3f 00 00 02',
["2.ICC"] = "02 94 b2 01 04 1d", ["02.ICC"] = '02 94 b2 01 04 1d',
["3.Select EnvHol file"]= '02 94 a4 08 00 04 20 00 20 01', ["03.Select EnvHol file"]= '02 94 a4 08 00 04 20 00 20 01',
["4.EnvHol1"] = '02 94 b2 01 04 1d', ["04.EnvHol1"] = '02 94 b2 01 04 1d',
["5.Select EvLog file"] = '02 94 a4 08 00 04 20 00 20 10', ["05.Select EvLog file"] = '02 94 a4 08 00 04 20 00 20 10',
["6.EvLog1"] = '06 00b2 0104 1d', ["06.EvLog1"] = '06 00b2 0104 1d',
["7.EvLog2"] = '06 00b2 0204 1d', ["07.EvLog2"] = '06 00b2 0204 1d',
["8.EvLog3"] = '06 00b2 0304 1d', ["08.EvLog3"] = '06 00b2 0304 1d',
-- ["Select ConList file"]= '42 01 04 0a 00a4 0800 04 2000 2050', ["09.Select ConList file"]= '42 01 04 0a 00a4 0800 04 2000 2050',
-- ["ConList"] = '42 01 06 06 00b2 0104 1d', ["10.ConList"] = '42 01 06 06 00b2 0104 1d',
-- ["Select Contra file"]= '42 01 08 0a 00a4 0800 04 2000 2020', ["11.Select Contra file"]= '42 01 08 0a 00a4 0800 04 2000 2020',
-- ["Contra1"] = '42 01 0a 06 00b2 0104 1d', ["12.Contra1"] = '42 01 0a 06 00b2 0104 1d',
-- ["Contra2"] = '42 01 0c 06 00b2 0204 1d', ["13.Contra2"] = '42 01 0c 06 00b2 0204 1d',
-- ["Contra3"] = '42 01 0e 06 00b2 0304 1d', ["14.Contra3"] = '42 01 0e 06 00b2 0304 1d',
-- ["Contra4"] = '42 01 00 06 00b2 0404 1d', ["15.Contra4"] = '42 01 00 06 00b2 0404 1d',
-- ["Select Counter file"]= '42 01 02 0a 00a4 0800 04 2000 2069', ["16.Select Counter file"]= '42 01 02 0a 00a4 0800 04 2000 2069',
-- ["Counter"] = '42 01 04 06 00b2 0104 1d', ["17.Counter"] = '42 01 04 06 00b2 0104 1d',
-- ["Select SpecEv file"]= '42 01 06 0a 00a4 08 0004 2000 2040', ["18.Select SpecEv file"]= '42 01 06 0a 00a4 08 0004 2000 2040',
-- ["SpecEv1"] = '42 01 08 06 00b2 0104 1d', ["19.SpecEv1"] = '42 01 08 06 00b2 0104 1d',
} }
--- ---
@ -214,11 +218,14 @@ function main(args)
--for i = 1,10 do --for i = 1,10 do
--result, err = calypso_send_cmd_raw('0294a40800043f000002',false) --select ICC file --result, err = calypso_send_cmd_raw('0294a40800043f000002',false) --select ICC file
for i, apdu in spairs(_calypso_cmds) do for i, apdu in spairs(_calypso_cmds) do
print('>>', i )
apdu = apdu:gsub("%s+","") apdu = apdu:gsub("%s+","")
result, err = calypso_send_cmd_raw(apdu , false) result, err = calypso_send_cmd_raw(apdu , false)
if result then if result then
calypso_apdu_status(result.data) calypso_apdu_status(result.data)
print( result.data ) print('<<', result.data )
else
print('<< no answer')
end end
end end
calypso_switch_off_field() calypso_switch_off_field()