mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
since I messed up the calypso and mobib lua script, I made a native implentatin instead. I leave the decoding of the extracted data for people to come to have some sort of challenge
This commit is contained in:
iceman1001
parent
2d36efe821
commit
1a3613901e
2 changed files with 236 additions and 19 deletions
|
|
@ -3,8 +3,9 @@ All notable changes to this project will be documented in this file.
|
||||||
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
|
||||||
|
|
||||||
## [unreleased][unreleased]
|
## [unreleased][unreleased]
|
||||||
- Removed `save_restoreDB` - replaced by `buffer_savestate_t` implementation (@HACKhalo2)
|
- Added `hf 14b mobib` - try to read out all data from a MOBIB card (@iceman1001)
|
||||||
- Removed `save_restoreGB` - replaced by `buffer_savestate_t` implementation (@HACKhalo2)
|
- Added `hf 14b calyso` - try to read out all data from a Calypso card (@iceman1001)
|
||||||
|
- Changed the graphbuffer handling implementation (@HACKhalo2)
|
||||||
- Changed `lf hitag dump --nrar` - now supports attack 1 from "gone in 360 seconds" paper. Thanks @kevsecurity! (@iceman1001)
|
- Changed `lf hitag dump --nrar` - now supports attack 1 from "gone in 360 seconds" paper. Thanks @kevsecurity! (@iceman1001)
|
||||||
- Added `lf hitag selftest` - converted from RFIDLers selftest (@iceman1001)
|
- Added `lf hitag selftest` - converted from RFIDLers selftest (@iceman1001)
|
||||||
- Added `lf hitag chk` - dictionary attack against card (@iceman1001)
|
- Added `lf hitag chk` - dictionary attack against card (@iceman1001)
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,14 @@
|
||||||
#define ST25_SIZE_2K 4
|
#define ST25_SIZE_2K 4
|
||||||
#define ST25_SIZE_4K 5
|
#define ST25_SIZE_4K 5
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
const char *desc;
|
||||||
|
const char *apdu;
|
||||||
|
const uint8_t apdulen;
|
||||||
|
} transport_14b_apdu_t;
|
||||||
|
|
||||||
|
|
||||||
// iso14b apdu input frame length
|
// iso14b apdu input frame length
|
||||||
static uint16_t apdu_frame_length = 0;
|
static uint16_t apdu_frame_length = 0;
|
||||||
//static uint16_t ats_fsc[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
|
//static uint16_t ats_fsc[] = {16, 24, 32, 40, 48, 64, 96, 128, 256};
|
||||||
|
|
@ -2643,6 +2651,211 @@ static int CmdHF14BView(const char *Cmd) {
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int CmdHF14BCalypsoRead(const char *Cmd) {
|
||||||
|
|
||||||
|
CLIParserContext *ctx;
|
||||||
|
CLIParserInit(&ctx, "hf 14b calypso",
|
||||||
|
"Reads out the contents of a ISO14443B Calypso card\n",
|
||||||
|
"hf 14b calypso"
|
||||||
|
);
|
||||||
|
void *argtable[] = {
|
||||||
|
arg_param_begin,
|
||||||
|
arg_param_end
|
||||||
|
};
|
||||||
|
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
|
||||||
|
transport_14b_apdu_t cmds[] = {
|
||||||
|
{"01.Select ICC file", "\x94\xa4\x08\x00\x04\x3f\x00\x00\x02", 9},
|
||||||
|
{"02.ICC", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"03.Select EnvHol file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x01", 9},
|
||||||
|
{"04.EnvHol1", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"05.Select EvLog file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x10", 9},
|
||||||
|
{"06.EvLog1", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"07.EvLog2", "\x94\xb2\x02\x04\x1d", 5},
|
||||||
|
{"08.EvLog3", "\x94\xb2\x03\x04\x1d", 5},
|
||||||
|
{"09.Select ConList file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x50", 9},
|
||||||
|
{"10.ConList", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"11.Select Contra file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x20", 9},
|
||||||
|
{"12.Contra1", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"13.Contra2", "\x94\xb2\x02\x04\x1d", 5},
|
||||||
|
{"14.Contra3", "\x94\xb2\x03\x04\x1d", 5},
|
||||||
|
{"15.Contra4", "\x94\xb2\x04\x04\x1d", 5},
|
||||||
|
{"16.Select Counter file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x69", 9},
|
||||||
|
{"17.Counter", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
{"18.Select SpecEv file", "\x94\xa4\x08\x00\x04\x20\x00\x20\x40", 9},
|
||||||
|
{"19.SpecEv1", "\x94\xb2\x01\x04\x1d", 5},
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
local CLA = '94'
|
||||||
|
local _calypso_cmds = {
|
||||||
|
|
||||||
|
-- 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
|
||||||
|
*/
|
||||||
|
bool activate_field = true;
|
||||||
|
bool leave_signal_on = true;
|
||||||
|
uint8_t response[PM3_CMD_DATA_SIZE] = { 0x00 };
|
||||||
|
|
||||||
|
for (int i = 0; i < ARRAYLEN(cmds); i++) {
|
||||||
|
|
||||||
|
int user_timeout = -1;
|
||||||
|
int resplen = 0;
|
||||||
|
int res = exchange_14b_apdu(
|
||||||
|
(uint8_t*)cmds[i].apdu,
|
||||||
|
cmds[i].apdulen,
|
||||||
|
activate_field,
|
||||||
|
leave_signal_on,
|
||||||
|
response,
|
||||||
|
PM3_CMD_DATA_SIZE,
|
||||||
|
&resplen,
|
||||||
|
user_timeout
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res != PM3_SUCCESS) {
|
||||||
|
PrintAndLogEx(FAILED, "sending command failed, aborting!");
|
||||||
|
switch_off_field_14b();
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t sw = get_sw(response, resplen);
|
||||||
|
if (sw != ISO7816_OK) {
|
||||||
|
PrintAndLogEx(ERR, "Sending command failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
|
||||||
|
switch_off_field_14b();
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "%s - %s", cmds[i].desc, sprint_hex(response, resplen));
|
||||||
|
activate_field = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch_off_field_14b();
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdHF14BMobibRead(const char *Cmd) {
|
||||||
|
|
||||||
|
CLIParserContext *ctx;
|
||||||
|
CLIParserInit(&ctx, "hf 14b mobib",
|
||||||
|
"Reads out the contents of a ISO14443B Mobib card\n",
|
||||||
|
"hf 14b mobib"
|
||||||
|
);
|
||||||
|
void *argtable[] = {
|
||||||
|
arg_param_begin,
|
||||||
|
arg_param_end
|
||||||
|
};
|
||||||
|
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
|
||||||
|
transport_14b_apdu_t cmds[] = {
|
||||||
|
{"01.SELECT AID 1TIC.ICA", "\x00\xa4\x04\x00\x08\x31\x54\x49\x43\x2e\x49\x43\x41", 13},
|
||||||
|
{"02.Select ICC file a", "\x00\xa4\x00\x00\x02\x3f\x00", 7},
|
||||||
|
{"03.Select ICC file b", "\x00\xa4\x00\x00\x02\x00\x02", 7},
|
||||||
|
{"04.ICC", "\x00\xb2\x01\x04\x1d", 5},
|
||||||
|
{"05.Select Holder file", "\x00\xa4\x00\x00\x02\x3f\x1c", 7},
|
||||||
|
{"06.Holder1", "\x00\xb2\x01\x04\x1d", 5},
|
||||||
|
{"07.Holder2", "\x00\xb2\x02\x04\x1d", 5},
|
||||||
|
{"08.Select EnvHol file a", "\x00\xa4\x00\x00\x00", 5},
|
||||||
|
{"09.Select EnvHol file b", "\x00\xa4\x00\x00\x02\x20\x00", 7},
|
||||||
|
{"10.Select EnvHol file c", "\x00\xa4\x00\x00\x02\x20\x01", 7},
|
||||||
|
{"11.EnvHol1", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"11.EnvHol2", "\x00\xb2\x02\x04\x1D", 5},
|
||||||
|
{"12.Select EvLog file", "\x00\xa4\x00\x00\x02\x20\x10", 7},
|
||||||
|
{"13.EvLog1", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"14.EvLog2", "\x00\xb2\x02\x04\x1D", 5},
|
||||||
|
{"15.EvLog3", "\x00\xb2\x03\x04\x1D", 5},
|
||||||
|
{"16.Select ConList file", "\x00\xa4\x00\x00\x02\x20\x50", 7},
|
||||||
|
{"17.ConList", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"18.Select Contra file", "\x00\xa4\x00\x00\x02\x20\x20", 7},
|
||||||
|
{"19.Contra1", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"20.Contra2", "\x00\xb2\x02\x04\x1D", 5},
|
||||||
|
{"21.Contra3", "\x00\xb2\x03\x04\x1D", 5},
|
||||||
|
{"22.Contra4", "\x00\xb2\x04\x04\x1D", 5},
|
||||||
|
{"23.Contra5", "\x00\xb2\x05\x04\x1D", 5},
|
||||||
|
{"24.Contra6", "\x00\xb2\x06\x04\x1D", 5},
|
||||||
|
{"25.Contra7", "\x00\xb2\x07\x04\x1D", 5},
|
||||||
|
{"26.Contra8", "\x00\xb2\x08\x04\x1D", 5},
|
||||||
|
{"27.Contra9", "\x00\xb2\x09\x04\x1D", 5},
|
||||||
|
{"28.ContraA", "\x00\xb2\x0a\x04\x1D", 5},
|
||||||
|
{"29.ContraB", "\x00\xb2\x0b\x04\x1D", 5},
|
||||||
|
{"30.ContraC", "\x00\xb2\x0c\x04\x1D", 5},
|
||||||
|
{"31.Select Counter file", "\x00\xa4\x00\x00\x02\x20\x69", 7},
|
||||||
|
{"32.Counter", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"33.Select LoadLog file a", "\x00\xa4\x00\x00\x00", 5},
|
||||||
|
{"34.Select LoadLog file b", "\x00\xa4\x00\x00\x02\x10\x00", 7},
|
||||||
|
{"35.Select LoadLog file c", "\x00\xa4\x00\x00\x02\x10\x14", 7},
|
||||||
|
{"36.LoadLog", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"37.Select Purcha file", "\x00\xa4\x00\x00\x02\x10\x15", 7},
|
||||||
|
{"38.Purcha1", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"39.Purcha2", "\x00\xb2\x02\x04\x1D", 5},
|
||||||
|
{"40.Purcha3", "\x00\xb2\x03\x04\x1D", 5},
|
||||||
|
{"41.Select SpecEv file a", "\x00\xa4\x00\x00\x00", 5},
|
||||||
|
{"42.Select SpecEv file b", "\x00\xa4\x00\x00\x02\x20\x00", 7},
|
||||||
|
{"43.Select SpecEv file c", "\x00\xa4\x00\x00\x02\x20\x40", 7},
|
||||||
|
{"44.SpecEv1", "\x00\xb2\x01\x04\x1D", 5},
|
||||||
|
{"45.SpecEv2", "\x00\xb2\x02\x04\x1D", 5},
|
||||||
|
{"46.SpecEv3", "\x00\xb2\x03\x04\x1D", 5},
|
||||||
|
{"47.SpecEv4", "\x00\xb2\x04\x04\x1d", 5},
|
||||||
|
};
|
||||||
|
|
||||||
|
bool activate_field = true;
|
||||||
|
bool leave_signal_on = true;
|
||||||
|
uint8_t response[PM3_CMD_DATA_SIZE] = { 0x00 };
|
||||||
|
|
||||||
|
for (int i = 0; i < ARRAYLEN(cmds); i++) {
|
||||||
|
|
||||||
|
int user_timeout = -1;
|
||||||
|
int resplen = 0;
|
||||||
|
int res = exchange_14b_apdu(
|
||||||
|
(uint8_t*)cmds[i].apdu,
|
||||||
|
cmds[i].apdulen,
|
||||||
|
activate_field,
|
||||||
|
leave_signal_on,
|
||||||
|
response,
|
||||||
|
PM3_CMD_DATA_SIZE,
|
||||||
|
&resplen,
|
||||||
|
user_timeout
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res != PM3_SUCCESS) {
|
||||||
|
PrintAndLogEx(FAILED, "sending command failed, aborting!");
|
||||||
|
switch_off_field_14b();
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t sw = get_sw(response, resplen);
|
||||||
|
if (sw != ISO7816_OK) {
|
||||||
|
PrintAndLogEx(ERR, "Sending command failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
|
||||||
|
switch_off_field_14b();
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "%s - %s", cmds[i].desc, sprint_hex(response, resplen));
|
||||||
|
activate_field = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch_off_field_14b();
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
static command_t CommandTable[] = {
|
static command_t CommandTable[] = {
|
||||||
{"---------", CmdHelp, AlwaysAvailable, "----------------------- " _CYAN_("General") " -----------------------"},
|
{"---------", CmdHelp, AlwaysAvailable, "----------------------- " _CYAN_("General") " -----------------------"},
|
||||||
{"help", CmdHelp, AlwaysAvailable, "This help"},
|
{"help", CmdHelp, AlwaysAvailable, "This help"},
|
||||||
|
|
@ -2661,6 +2874,9 @@ static command_t CommandTable[] = {
|
||||||
{"wrbl", CmdHF14BSriWrbl, IfPm3Iso14443b, "Write data to a SRI512/SRIX4 tag"},
|
{"wrbl", CmdHF14BSriWrbl, IfPm3Iso14443b, "Write data to a SRI512/SRIX4 tag"},
|
||||||
{"view", CmdHF14BView, AlwaysAvailable, "Display content from tag dump file"},
|
{"view", CmdHF14BView, AlwaysAvailable, "Display content from tag dump file"},
|
||||||
{"valid", CmdSRIX4kValid, AlwaysAvailable, "SRIX4 checksum test"},
|
{"valid", CmdSRIX4kValid, AlwaysAvailable, "SRIX4 checksum test"},
|
||||||
|
{"---------", CmdHelp, AlwaysAvailable, "------------------ " _CYAN_("Calypso / Mobib") " ------------------"},
|
||||||
|
{"calypso", CmdHF14BCalypsoRead, IfPm3Iso14443b, "Read contents of a Calypso card"},
|
||||||
|
{"mobib", CmdHF14BMobibRead, IfPm3Iso14443b, "Read contents of a Mobib card"},
|
||||||
{NULL, NULL, NULL, NULL}
|
{NULL, NULL, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue