X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ab6d8a4c479af53c4d5d8649a5ea2658bbad2d7c..0062cc1ca1d5a166a623f6a468c9901e214e3744:/client/scripts/calypso.lua?ds=inline
diff --git a/client/scripts/calypso.lua b/client/scripts/calypso.lua
index a19c962d..281ea944 100644
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -2,6 +2,7 @@ local cmds = require('commands')
local getopt = require('getopt')
local lib14b = require('read14b')
local utils = require('utils')
+local iso7816 = require('7816_error')
example = "script runs 14b raw commands to query a CAPLYPSO tag"
author = "Iceman, 2016"
@@ -51,6 +52,7 @@ local function calypso_parse(result)
local r = Command.parse(result)
local len = r.arg2 * 2
r.data = string.sub(r.data, 0, len);
+ print('GOT:', r.data)
if r.arg1 == 0 then
return r, nil
end
@@ -151,35 +153,58 @@ local function calypso_apdu_status(apdu)
-- next two is APDU status bytes.
local status = false
local mess = 'FAIL'
- local sw = apdu:sub( #apdu-7, #apdu-4)
- if sw == '9000' then
- mess = 'OK'
- status = true
- end
- print ('SW', sw, mess )
+ local sw = apdu:sub( #apdu-7, #apdu-4)
+ desc, err = iso7816.tostring(sw)
+ print ('SW', sw, desc, err )
+
+ status = ( sw == '9000' )
+
return status
end
local _calypso_cmds = {
- ["01.Select ICC file"] = '02 94 a4 08 00 04 3f 00 00 02',
- ["02.ICC"] = '02 94 b2 01 041d',
- ["03.Select EnvHol file"] = '02 94 a4 08 00 04 20 00 20 01',
- ["04.EnvHol1"] = '02 94 b2 01 041d',
- ["05.Select EvLog file"] = '02 94 a4 08 00 04 20 00 20 10',
- ["06.EvLog1"] = '02 94 b2 01 041d',
- ["07.EvLog2"] = '02 94 b2 02 041d',
- ["08.EvLog3"] = '02 94 b2 03 041d',
- ["09.Select ConList file"] ='02 94 a4 0800 04 2000 2050',
- ["10.ConList"] = '02 94 b2 01 041d',
- ["11.Select Contra file"] = '02 94 a4 0800 04 2000 2020',
- ["12.Contra1"] = '02 94 b2 01 041d',
- ["13.Contra2"] = '02 94 b2 02 041d',
- ["14.Contra3"] = '02 94 b2 03 041d',
- ["15.Contra4"] = '02 94 b2 04 041d',
- ["16.Select Counter file"]= '02 94 a4 0800 04 2000 2069',
- ["17.Counter"] = '02 94 b2 01 041d',
- ["18.Select SpecEv file"]= '02 94 a4 08 0004 2000 2040',
- ["19.SpecEv1"] = '02 94 b2 01 041d',
+
+-- Break down of command bytes:
+-- A4 = select
+-- Master File 3F00
+-- 0x3F = master file
+-- 0x00 = master file id, is constant to 0x00.
+
+-- DF Dedicated File 38nn
+-- can be seen as directories
+-- 0x38
+-- 0xNN id
+-- ["01.Select ICC file"] = '0294 a4 080004 3f00 0002',
+
+-- EF Elementary File
+-- EF1 Pin file
+-- EF2 Key file
+-- Grey Lock file
+-- Electronic deposit file
+-- Electronic Purse file
+-- Electronic Transaction log file
+
+
+ --["01.Select ICC file"] = '0294 a4 00 0002 3f00',
+ ["01.Select ICC file"] = '0294 a4 080004 3f00 0002',
+ ["02.ICC"] = '0394 b2 01 041d',
+ ["03.Select EnvHol file"] = '0294 a4 080004 2000 2001',
+ ["04.EnvHol1"] = '0394 b2 01 041d',
+ ["05.Select EvLog file"] = '0294 a4 080004 2000 2010',
+ ["06.EvLog1"] = '0394 b2 01 041d',
+ ["07.EvLog2"] = '0294 b2 02 041d',
+ ["08.EvLog3"] = '0394 b2 03 041d',
+ ["09.Select ConList file"] ='0294 a4 080004 2000 2050',
+ ["10.ConList"] = '0394 b2 01 041d',
+ ["11.Select Contra file"] = '0294 a4 080004 2000 2020',
+ ["12.Contra1"] = '0394 b2 01 041d',
+ ["13.Contra2"] = '0294 b2 02 041d',
+ ["14.Contra3"] = '0394 b2 03 041d',
+ ["15.Contra4"] = '0294 b2 04 041d',
+ ["16.Select Counter file"]= '0394 a4 080004 2000 2069',
+ ["17.Counter"] = '0294 b2 01 041d',
+ ["18.Select SpecEv file"]= '0394 a4 080004 2000 2040',
+ ["19.SpecEv1"] = '0294 b2 01 041d',
}
---
@@ -212,7 +237,7 @@ function main(args)
P2 5
LEN_
0 1 2 3 4 5 6 7
- apdu = '0a 00 94 a4 08 00 04 3f 00 00 02' --select ICC file
+ apdu = '02 94 a4 08 00 04 3f 00 00 02' --select ICC file
DF_NAME = "1TIC.ICA"
--]]
--for i = 1,10 do