Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
This commit is contained in:
commit
3620739645
4 files changed
+410
-24
No files matched your search
+399
-19
@@ -48,6 +48,9 @@
|
||||
|
||||
// for static arrays
|
||||
#define ST25TB_SR_BLOCK_SIZE 4
|
||||
#define CTS_BLOCK_SIZE 2
|
||||
#define CTS256_BLOCK_COUNT 16
|
||||
#define CTS512_BLOCK_COUNT 32
|
||||
|
||||
|
||||
// SR memory sizes
|
||||
@@ -757,17 +760,44 @@ static void print_st_general_info(uint8_t *data, uint8_t len) {
|
||||
PrintAndLogEx(SUCCESS, "Chip: %02X, " _YELLOW_("%s"), chipid, get_st_chip_model(chipid));
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
uint8_t product_code;
|
||||
const char *name;
|
||||
uint8_t block_count;
|
||||
} cts_product_info_t;
|
||||
|
||||
static const cts_product_info_t cts_products[] = {
|
||||
{ASK_CTS_PRODUCT_CODE_CTS256B, "CTS256B", CTS256_BLOCK_COUNT},
|
||||
{ASK_CTS_PRODUCT_CODE_CTS512B, "CTS512B", CTS512_BLOCK_COUNT},
|
||||
};
|
||||
|
||||
static const cts_product_info_t cts_unknown_product = {
|
||||
0x00,
|
||||
"unknown",
|
||||
CTS256_BLOCK_COUNT,
|
||||
};
|
||||
|
||||
static const cts_product_info_t *get_cts_product_info(uint8_t product_code) {
|
||||
for (size_t i = 0; i < ARRAYLEN(cts_products); i++) {
|
||||
if (cts_products[i].product_code == product_code) {
|
||||
return &cts_products[i];
|
||||
}
|
||||
}
|
||||
return &cts_unknown_product;
|
||||
}
|
||||
|
||||
// print UID info from ASK CT chips
|
||||
static void print_ct_general_info(void *vcard) {
|
||||
iso14b_cts_card_select_t card;
|
||||
memcpy(&card, (iso14b_cts_card_select_t *)vcard, sizeof(iso14b_cts_card_select_t));
|
||||
|
||||
uint32_t uid32 = MemLeToUint4byte(card.uid);
|
||||
const cts_product_info_t *product_info = get_cts_product_info(card.pc);
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(SUCCESS, "ASK C-Ticket");
|
||||
PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s") " ( " _YELLOW_("%010u") " )", sprint_hex(card.uid, sizeof(card.uid)), uid32);
|
||||
PrintAndLogEx(SUCCESS, " Product Code: %02X", card.pc);
|
||||
PrintAndLogEx(SUCCESS, " Facility Code: %02X", card.fc);
|
||||
PrintAndLogEx(INFO, "--- " _CYAN_("ASK CTS / C-ticket") " -----------------------");
|
||||
PrintAndLogEx(SUCCESS, " UID : " _GREEN_("%s") " ( " _YELLOW_("%010u") " )", sprint_hex(card.uid, sizeof(card.uid)), uid32);
|
||||
PrintAndLogEx(SUCCESS, " Product Code : %02X ( " _YELLOW_("%s") " )", card.pc, product_info->name);
|
||||
PrintAndLogEx(SUCCESS, " Fab Code : %02X", card.fc);
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
|
||||
@@ -807,26 +837,26 @@ static void print_footer(void) {
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
|
||||
/*
|
||||
static void print_ct_blocks(uint8_t *data, size_t len) {
|
||||
|
||||
size_t blocks = len / ST25TB_SR_BLOCK_SIZE;
|
||||
size_t blocks = len / CTS_BLOCK_SIZE;
|
||||
|
||||
print_hdr();
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(INFO, " block# | data | ascii");
|
||||
PrintAndLogEx(INFO, "---------+-------+------");
|
||||
|
||||
for (int i = 0; i <= blocks; i++) {
|
||||
for (int i = 0; i < blocks; i++) {
|
||||
PrintAndLogEx(INFO,
|
||||
"%3d/0x%02X | %s | %s | %s",
|
||||
"%3d/0x%02X | %s| %s",
|
||||
i,
|
||||
i,
|
||||
sprint_hex(data + (i * 4), 4),
|
||||
" ",
|
||||
sprint_ascii(data + (i * 4), 4)
|
||||
sprint_hex(data + (i * CTS_BLOCK_SIZE), CTS_BLOCK_SIZE),
|
||||
sprint_ascii(data + (i * CTS_BLOCK_SIZE), CTS_BLOCK_SIZE)
|
||||
);
|
||||
}
|
||||
print_footer();
|
||||
PrintAndLogEx(INFO, "---------+-------+------");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
*/
|
||||
|
||||
static void print_sr_blocks(uint8_t *data, size_t len, const uint8_t *uid, bool dense_output) {
|
||||
|
||||
@@ -892,6 +922,48 @@ static void print_sr_blocks(uint8_t *data, size_t len, const uint8_t *uid, bool
|
||||
print_footer();
|
||||
}
|
||||
|
||||
static void print_std_blocks(uint8_t *data, size_t len, const uint8_t *uid, uint8_t uidlen, bool dense_output) {
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(INFO, "-------- " _CYAN_("ISO14443-B Standard tag memory") " ---------");
|
||||
PrintAndLogEx(INFO, "PUPI..... " _GREEN_("%s"), sprint_hex(uid, uidlen));
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(INFO, " offset | data | ascii");
|
||||
PrintAndLogEx(INFO, "---------+--------------------------------------------------+------------------");
|
||||
|
||||
const size_t ROW = 16;
|
||||
bool in_repeat = false;
|
||||
|
||||
for (size_t off = 0; off < len; off += ROW) {
|
||||
size_t row_len = MIN(ROW, len - off);
|
||||
uint8_t *row = data + off;
|
||||
|
||||
if (dense_output
|
||||
&& off >= ROW
|
||||
&& off + ROW < len
|
||||
&& !in_repeat
|
||||
&& row_len == ROW
|
||||
&& memcmp(row, row - ROW, ROW) == 0
|
||||
&& off + 2 * ROW <= len
|
||||
&& memcmp(row, row + ROW, ROW) == 0) {
|
||||
in_repeat = true;
|
||||
PrintAndLogEx(INFO, " ......");
|
||||
} else if (in_repeat
|
||||
&& (off + ROW >= len || memcmp(row, row + ROW, ROW) != 0)) {
|
||||
in_repeat = false;
|
||||
}
|
||||
|
||||
if (!in_repeat) {
|
||||
PrintAndLogEx(INFO, "%5u/0x%04X | %-48s| %s",
|
||||
(uint32_t)off, (uint32_t)off,
|
||||
sprint_hex(row, row_len),
|
||||
sprint_ascii(row, row_len));
|
||||
}
|
||||
}
|
||||
|
||||
PrintAndLogEx(INFO, "---------+--------------------------------------------------+------------------");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
}
|
||||
|
||||
// iceman, calypso?
|
||||
// 05 00 00 = find one tag in field
|
||||
// 1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
|
||||
@@ -1446,6 +1518,85 @@ static int CmdHF14Binfo(const char *Cmd) {
|
||||
// #define ISO14443B_READ_BLK 0x08
|
||||
// #define ISO14443B_WRITE_BLK 0x09
|
||||
|
||||
static int select_cts_card_14443b(bool disconnect, iso14b_cts_card_select_t *card, bool verbose) {
|
||||
iso14b_raw_cmd_t packet = {
|
||||
.flags = (ISO14B_CONNECT | ISO14B_SELECT_CTS | ISO14B_CLEARTRACE),
|
||||
.timeout = 0,
|
||||
.rawlen = 0,
|
||||
};
|
||||
|
||||
if (disconnect) {
|
||||
packet.flags |= ISO14B_DISCONNECT;
|
||||
}
|
||||
|
||||
clearCommandBuffer();
|
||||
PacketResponseNG resp;
|
||||
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t));
|
||||
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT) == false) {
|
||||
if (verbose) {
|
||||
PrintAndLogEx(WARNING, "timeout while waiting for reply");
|
||||
}
|
||||
return PM3_ETIMEOUT;
|
||||
}
|
||||
|
||||
if (resp.status != PM3_SUCCESS) {
|
||||
if (verbose) {
|
||||
PrintAndLogEx(FAILED, "ISO 14443-b CTS select failed");
|
||||
}
|
||||
return resp.status;
|
||||
}
|
||||
|
||||
if (resp.length < sizeof(iso14b_cts_card_select_t)) {
|
||||
if (verbose) {
|
||||
PrintAndLogEx(FAILED, "ISO 14443-3 CTS wrong length");
|
||||
}
|
||||
return PM3_ELENGTH;
|
||||
}
|
||||
|
||||
if (card) {
|
||||
memcpy(card, resp.data.asBytes, sizeof(iso14b_cts_card_select_t));
|
||||
}
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int read_cts_block(uint8_t blockno, uint8_t *out, uint16_t out_len) {
|
||||
uint8_t psize = sizeof(iso14b_raw_cmd_t) + 1;
|
||||
iso14b_raw_cmd_t *packet = (iso14b_raw_cmd_t *)calloc(1, psize);
|
||||
if (packet == NULL) {
|
||||
PrintAndLogEx(WARNING, "Failed to allocate memory");
|
||||
return PM3_EMALLOC;
|
||||
}
|
||||
packet->flags = (ISO14B_APPEND_CRC | ISO14B_RAW);
|
||||
packet->timeout = 0;
|
||||
packet->rawlen = 1;
|
||||
packet->raw[0] = ASK_READ | (blockno & ASK_BLOCK_ADDRESS_MASK);
|
||||
|
||||
clearCommandBuffer();
|
||||
PacketResponseNG resp;
|
||||
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)packet, psize);
|
||||
free(packet);
|
||||
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT) == false) {
|
||||
return PM3_ETIMEOUT;
|
||||
}
|
||||
|
||||
if (resp.status != PM3_SUCCESS) {
|
||||
return resp.status;
|
||||
}
|
||||
|
||||
if (resp.length != CTS_BLOCK_SIZE + 2) {
|
||||
return PM3_ELENGTH;
|
||||
}
|
||||
|
||||
if (check_crc(CRC_14443_B, resp.data.asBytes, resp.length) == false) {
|
||||
return PM3_ECRC;
|
||||
}
|
||||
|
||||
if (out) {
|
||||
memcpy(out, resp.data.asBytes, MIN(out_len, CTS_BLOCK_SIZE));
|
||||
}
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int read_sr_block(uint8_t blockno, uint8_t *out, uint16_t out_len) {
|
||||
struct {
|
||||
uint8_t blockno;
|
||||
@@ -1614,6 +1765,7 @@ static bool HF14B_ask_ct_reader(bool verbose) {
|
||||
switch (resp.status) {
|
||||
case PM3_SUCCESS: {
|
||||
print_ct_general_info(resp.data.asBytes);
|
||||
PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14b ct") "`");
|
||||
return true;
|
||||
}
|
||||
case PM3_ELENGTH: {
|
||||
@@ -1686,6 +1838,7 @@ static bool HF14B_prime_reader(bool verbose) {
|
||||
return false;
|
||||
}
|
||||
print_prime_general_info(&card);
|
||||
PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf calypso") "`");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1775,6 +1928,119 @@ static int CmdHF14BReader(const char *Cmd) {
|
||||
return readHF14B(cm, verbose, read_plot);
|
||||
}
|
||||
|
||||
static int CmdHF14BCtsDump(const char *Cmd) {
|
||||
CLIParserContext *ctx;
|
||||
CLIParserInit(&ctx, "hf 14b ctdump",
|
||||
"Read and print ASK CTS / C-ticket memory blocks",
|
||||
"hf 14b ctdump\n"
|
||||
"hf 14b ctdump -v"
|
||||
);
|
||||
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
arg_lit0("v", "verbose", "verbose output"),
|
||||
arg_param_end
|
||||
};
|
||||
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||
bool verbose = arg_get_lit(ctx, 1);
|
||||
CLIParserFree(ctx);
|
||||
|
||||
iso14b_cts_card_select_t card = {0};
|
||||
int status = select_cts_card_14443b(false, &card, verbose);
|
||||
if (status != PM3_SUCCESS) {
|
||||
switch_off_field_14b();
|
||||
PrintAndLogEx(WARNING, "no ASK CTS / C-ticket tag found");
|
||||
return status;
|
||||
}
|
||||
|
||||
print_ct_general_info(&card);
|
||||
|
||||
const cts_product_info_t *product_info = get_cts_product_info(card.pc);
|
||||
uint8_t block_count = product_info->block_count;
|
||||
uint8_t data[CTS512_BLOCK_COUNT * CTS_BLOCK_SIZE] = {0};
|
||||
|
||||
PrintAndLogEx(INFO, "Reading %u blocks", block_count);
|
||||
|
||||
for (uint8_t blockno = 0; blockno < block_count; blockno++) {
|
||||
status = PM3_ESOFT;
|
||||
for (uint8_t retry = 0; retry < 3; retry++) {
|
||||
status = read_cts_block(blockno, data + (blockno * CTS_BLOCK_SIZE), CTS_BLOCK_SIZE);
|
||||
if (status == PM3_SUCCESS) {
|
||||
break;
|
||||
}
|
||||
if (verbose) {
|
||||
PrintAndLogEx(DEBUG, "block %u read failed, status %d, retry %u", blockno, status, retry + 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (status != PM3_SUCCESS) {
|
||||
switch_off_field_14b();
|
||||
PrintAndLogEx(FAILED, "failed to read block %u (status %d)", blockno, status);
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
switch_off_field_14b();
|
||||
print_ct_blocks(data, block_count * CTS_BLOCK_SIZE);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int CmdHF14BCtRdBl(const char *Cmd) {
|
||||
CLIParserContext *ctx;
|
||||
CLIParserInit(&ctx, "hf 14b ctrdbl",
|
||||
"Read an ASK CTS / C-ticket block",
|
||||
"hf 14b ctrdbl -b 6\n"
|
||||
"hf 14b ctrdbl --block 15 -v"
|
||||
);
|
||||
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
arg_int1("b", "block", "<dec>", "block number"),
|
||||
arg_lit0("v", "verbose", "verbose output"),
|
||||
arg_param_end
|
||||
};
|
||||
CLIExecWithReturn(ctx, Cmd, argtable, false);
|
||||
int blockno = arg_get_int_def(ctx, 1, -1);
|
||||
bool verbose = arg_get_lit(ctx, 2);
|
||||
CLIParserFree(ctx);
|
||||
|
||||
if (blockno < 0 || blockno > ASK_BLOCK_ADDRESS_MASK) {
|
||||
PrintAndLogEx(FAILED, "block number out of range, max %u (0x%02X), got " _RED_("%d"),
|
||||
ASK_BLOCK_ADDRESS_MASK, ASK_BLOCK_ADDRESS_MASK, blockno);
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
|
||||
iso14b_cts_card_select_t card = {0};
|
||||
int status = select_cts_card_14443b(false, &card, verbose);
|
||||
if (status != PM3_SUCCESS) {
|
||||
switch_off_field_14b();
|
||||
PrintAndLogEx(WARNING, "no ASK CTS / C-ticket tag found");
|
||||
return status;
|
||||
}
|
||||
|
||||
const cts_product_info_t *product_info = get_cts_product_info(card.pc);
|
||||
if (blockno >= product_info->block_count) {
|
||||
switch_off_field_14b();
|
||||
PrintAndLogEx(FAILED, "block number out of range for %s, max %u (0x%02X), got " _RED_("%d"),
|
||||
product_info->name, product_info->block_count - 1, product_info->block_count - 1, blockno);
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
print_ct_general_info(&card);
|
||||
}
|
||||
|
||||
uint8_t out[CTS_BLOCK_SIZE] = {0};
|
||||
status = read_cts_block((uint8_t)blockno, out, sizeof(out));
|
||||
switch_off_field_14b();
|
||||
|
||||
if (status == PM3_SUCCESS) {
|
||||
PrintAndLogEx(SUCCESS, "block %02u... " _GREEN_("%s") " | " _GREEN_("%s"),
|
||||
blockno, sprint_hex(out, sizeof(out)), sprint_ascii(out, sizeof(out)));
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
// Read SRI512|SRIX4K block
|
||||
static int CmdHF14BSriRdBl(const char *Cmd) {
|
||||
|
||||
@@ -1987,10 +2253,121 @@ static int CmdHF14BDump(const char *Cmd) {
|
||||
}
|
||||
|
||||
if (select_cardtype == ISO14B_STANDARD) {
|
||||
// Have to figure out how large one of these are..
|
||||
PrintAndLogEx(FAILED, "Dumping Standard ISO14443-B tags is not implemented yet.");
|
||||
// print_std_blocks(data, cardsize);
|
||||
return switch_off_field_14b();
|
||||
iso14b_card_select_t card;
|
||||
memcpy(&card, (iso14b_card_select_t *)&select, sizeof(iso14b_card_select_t));
|
||||
|
||||
PrintAndLogEx(INFO, "Found standard ISO14443-B tag");
|
||||
PrintAndLogEx(INFO, "PUPI: " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen));
|
||||
PrintAndLogEx(INFO, "reading tag memory...");
|
||||
|
||||
// 58-byte chunks are safe for all ISO14443-B frame sizes
|
||||
const uint8_t CHUNK = 0x3A;
|
||||
// 16 KB total ceiling; SFI scan covers 30 EFs * 256 bytes = 7680 bytes max
|
||||
const uint16_t MAX_TOT = 0x4000;
|
||||
|
||||
uint8_t *data = calloc(MAX_TOT, 1);
|
||||
if (data == NULL) {
|
||||
PrintAndLogEx(WARNING, "Failed to allocate memory");
|
||||
return PM3_EMALLOC;
|
||||
}
|
||||
|
||||
uint16_t total = 0;
|
||||
uint8_t resp_buf[PM3_CMD_DATA_SIZE];
|
||||
int resplen = 0;
|
||||
// Field is off after get_14b_UID (ISO14B_DISCONNECT); track so we only
|
||||
// pay the WUPB+ATTRIB reconnect cost once across both phases.
|
||||
bool need_activate = true;
|
||||
|
||||
PrintAndLogEx(INFO, "." NOLF);
|
||||
|
||||
// ---- Phase A: transparent READ BINARY ----
|
||||
// Works for simple memory cards that have an implicit current EF.
|
||||
// ISO7816-4 READ BINARY: P1[6:0] = offset[14:8], P2 = offset[7:0]
|
||||
for (uint16_t off = 0; off < MAX_TOT;) {
|
||||
uint8_t le = (uint8_t)MIN((int)CHUNK, (int)(MAX_TOT - off));
|
||||
uint8_t rb[5] = {0x00, 0xB0, (uint8_t)((off >> 8) & 0x7F),
|
||||
(uint8_t)(off & 0xFF), le
|
||||
};
|
||||
int res = exchange_14b_apdu(rb, sizeof(rb), need_activate, true,
|
||||
resp_buf, sizeof(resp_buf), &resplen, -1);
|
||||
need_activate = (res != PM3_SUCCESS);
|
||||
if (res != PM3_SUCCESS || resplen < 2) break;
|
||||
|
||||
uint16_t sw = get_sw(resp_buf, resplen);
|
||||
if (sw != ISO7816_OK) break;
|
||||
|
||||
uint16_t got = (uint16_t)(resplen - 2);
|
||||
memcpy(data + total, resp_buf, got);
|
||||
total += got;
|
||||
off += got;
|
||||
PrintAndLogEx(NORMAL, "." NOLF);
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
// ---- Phase B: SFI scan ----
|
||||
// ISO7816-4 §7.2.3: when P1 bit 7 is set, bits 4-0 carry a short file
|
||||
// identifier (SFI 1-30). The card reads the addressed EF directly without
|
||||
// requiring a prior SELECT EF, so SW=6986 ("no current EF") is avoided.
|
||||
// P2 is the byte offset within the EF (0-255; SFI form is limited to 256
|
||||
// bytes per EF — use standard SELECT+READ BINARY for longer files).
|
||||
if (total == 0) {
|
||||
bool transport_ok = true;
|
||||
for (uint8_t sfi = 1; sfi <= 30 && transport_ok && total < MAX_TOT; sfi++) {
|
||||
for (uint8_t ef_off = 0; ;) {
|
||||
uint8_t le = (uint8_t)MIN((int)CHUNK, (int)(MAX_TOT - total));
|
||||
uint8_t rb[5] = {0x00, 0xB0, (uint8_t)(0x80 | sfi), ef_off, le};
|
||||
int res = exchange_14b_apdu(rb, sizeof(rb), need_activate, true,
|
||||
resp_buf, sizeof(resp_buf), &resplen, -1);
|
||||
if (res != PM3_SUCCESS) { need_activate = true; transport_ok = false; break; }
|
||||
need_activate = false;
|
||||
|
||||
uint16_t sw = get_sw(resp_buf, resplen);
|
||||
if (sw != ISO7816_OK) break; // 6A82=not found, 6282=EOF, etc.
|
||||
|
||||
uint16_t got = (uint16_t)(resplen - 2);
|
||||
memcpy(data + total, resp_buf, got);
|
||||
total += got;
|
||||
PrintAndLogEx(NORMAL, "." NOLF);
|
||||
fflush(stdout);
|
||||
|
||||
// Guard uint8_t ef_off against overflow before advancing
|
||||
if ((uint16_t)ef_off + got > 0xFF || got < le || total >= MAX_TOT) break;
|
||||
ef_off += (uint8_t)got;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
switch_off_field_14b();
|
||||
|
||||
if (total == 0) {
|
||||
PrintAndLogEx(WARNING, "No data could be read directly or via SFI.");
|
||||
PrintAndLogEx(HINT, "Hint: tag requires application-specific APDUs.");
|
||||
PrintAndLogEx(HINT, " Try `hf 14b apdu -d 00A4040007D2760000850101 00` to select NDEF,");
|
||||
PrintAndLogEx(HINT, " or `hf 14b ndefread` if the tag holds NFC content.");
|
||||
free(data);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
PrintAndLogEx(SUCCESS, "read " _GREEN_("%u") " bytes", (uint32_t)total);
|
||||
print_std_blocks(data, total, card.uid, card.uidlen, dense_output);
|
||||
|
||||
if (nosave) {
|
||||
PrintAndLogEx(INFO, "Called with no save option");
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
free(data);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
if (fnlen < 1) {
|
||||
PrintAndLogEx(INFO, "using PUPI as filename");
|
||||
char *fptr = filename + snprintf(filename, sizeof(filename), "hf-14b-");
|
||||
FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
|
||||
}
|
||||
|
||||
pm3_save_dump(filename, data, total, jsf14b_v2);
|
||||
free(data);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
if (select_cardtype == ISO14B_SR) {
|
||||
@@ -2755,7 +3132,7 @@ static int CmdHF14BAPDU(const char *Cmd) {
|
||||
arg_lit0("t", "tlv", "executes TLV decoder if it possible"),
|
||||
arg_lit0(NULL, "decode", "decode apdu request if it possible"),
|
||||
arg_str0("m", "make", "<hex>", "make apdu with head from this field and data from data field.\n"
|
||||
" must be 4 bytes: <CLA INS P1 P2>"),
|
||||
" must be 4 bytes: <CLA INS P1 P2>"),
|
||||
arg_lit0("e", "extended", "make extended length apdu if `m` parameter included"),
|
||||
arg_int0("l", "le", "<int>", "Le apdu parameter if `m` parameter included"),
|
||||
arg_str1("d", "data", "<hex>", "<APDU | data> if `m` parameter included"),
|
||||
@@ -3363,6 +3740,9 @@ static command_t CommandTable[] = {
|
||||
{"tearoff", CmdHF14BSriTearoff, IfPm3Iso14443b, "Tear-off attack on ST25TB/SRx counter blocks"},
|
||||
{"view", CmdHF14BView, AlwaysAvailable, "Display content from tag dump file"},
|
||||
{"valid", CmdSRIX4kValid, AlwaysAvailable, "SRIX4 checksum test"},
|
||||
{"---------", CmdHelp, IfPm3Iso14443b, "------------------ " _CYAN_("ASK CTS / C-ticket") " ------------------"},
|
||||
{"ctdump", CmdHF14BCtsDump, IfPm3Iso14443b, "Dump ASK CTS/C-ticket"},
|
||||
{"ctrdbl", CmdHF14BCtRdBl, IfPm3Iso14443b, "Read ASK CTS/C-ticket block"},
|
||||
{"---------", CmdHelp, IfPm3Iso14443b, "------------------------- " _CYAN_("Magic") " -----------------------"},
|
||||
{"setuid", CmdHF14BSetUID, IfPm3Iso14443b, "Set UID for magic card"},
|
||||
{NULL, NULL, NULL, NULL}
|
||||
|
||||
Reference in new issue
Block a user