From 63e92c187c53416c04cd99858dabcd601f2a03d6 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 25 Nov 2020 14:43:39 +0100 Subject: [PATCH] lf visa - now uses cliparser and reader continuous mode --- client/src/cmdlfvisa2000.c | 133 ++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/client/src/cmdlfvisa2000.c b/client/src/cmdlfvisa2000.c index 7fc3f89a5..04e16e727 100644 --- a/client/src/cmdlfvisa2000.c +++ b/client/src/cmdlfvisa2000.c @@ -27,41 +27,14 @@ #include "lfdemod.h" // parityTest #include "cmdlft55xx.h" // write verify #include "cmdlfem4x05.h" // +#include "cliparser.h" -#define BL0CK1 0x56495332 +#ifndef VISA2k_BL0CK1 +#define VISA2k_BL0CK1 0x56495332 +#endif static int CmdHelp(const char *Cmd); -static int usage_lf_visa2k_clone(void) { - PrintAndLogEx(NORMAL, "clone a Visa2000 tag to a T55x7 or Q5/T5555 tag."); - PrintAndLogEx(NORMAL, "Usage: lf visa2000 clone [h] "); - PrintAndLogEx(NORMAL, "Options:"); - PrintAndLogEx(NORMAL, " h : This help"); - PrintAndLogEx(NORMAL, " : Visa2k card ID"); - PrintAndLogEx(NORMAL, " : specify writing to Q5/T5555 tag"); - PrintAndLogEx(NORMAL, " : specify writing to EM4305/4469 tag"); - PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(NORMAL, "Examples:"); - PrintAndLogEx(NORMAL, _YELLOW_(" lf visa2000 clone 112233")); - PrintAndLogEx(NORMAL, _YELLOW_(" lf visa2000 clone 112233 q5") " -- encode for Q5/T5555"); - PrintAndLogEx(NORMAL, _YELLOW_(" lf visa2000 clone 112233 em4305") " -- encode for EM4305/4469"); - return PM3_SUCCESS; -} - -static int usage_lf_visa2k_sim(void) { - PrintAndLogEx(NORMAL, "Enables simulation of visa2k card with specified card number."); - PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued."); - PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(NORMAL, "Usage: lf visa2000 sim [h] "); - PrintAndLogEx(NORMAL, "Options:"); - PrintAndLogEx(NORMAL, " h : This help"); - PrintAndLogEx(NORMAL, " : Visa2k card ID"); - PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(NORMAL, "Examples:"); - PrintAndLogEx(NORMAL, _YELLOW_(" lf visa2000 sim 112233")); - return PM3_SUCCESS; -} - static uint8_t visa_chksum(uint32_t id) { uint8_t sum = 0; for (uint8_t i = 0; i < 32; i += 4) @@ -165,43 +138,72 @@ static int CmdVisa2kDemod(const char *Cmd) { } // 64*96*2=12288 samples just in case we just missed the first preamble we can still catch 2 of them -static int CmdVisa2kRead(const char *Cmd) { - (void)Cmd; // Cmd is not used so far - lf_read(false, 20000); - return demodVisa2k(true); +static int CmdVisa2kReader(const char *Cmd) { + CLIParserContext *ctx; + CLIParserInit(&ctx, "lf visa2000 reader", + "read a visa2000 tag", + "lf visa2000 reader -@ -> continuous reader mode" + ); + + void *argtable[] = { + arg_param_begin, + arg_lit0("@", NULL, "optional - continuous reader mode"), + arg_param_end + }; + CLIExecWithReturn(ctx, Cmd, argtable, true); + bool cm = arg_get_lit(ctx, 1); + CLIParserFree(ctx); + + do { + lf_read(false, 20000); + demodVisa2k(!cm); + } while (cm && !kbd_enter_pressed()); + return PM3_SUCCESS; } static int CmdVisa2kClone(const char *Cmd) { - uint64_t id = 0; - uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, BL0CK1, 0}; + CLIParserContext *ctx; + CLIParserInit(&ctx, "lf visa2000 clone", + "clone a Visa2000 tag to a T55x7, Q5/T5555 or EM4305/4469 tag.", + "lf visa2000 clone --cn 112233\n" + "lf visa2000 clone --cn 112233 --q5 -> encode for Q5/T5555 tag\n" + "lf visa2000 clone --cn 112233 --em -> encode for EM4305/4469" + ); - char cmdp = tolower(param_getchar(Cmd, 0)); - if (strlen(Cmd) == 0 || cmdp == 'h') - return usage_lf_visa2k_clone(); + void *argtable[] = { + arg_param_begin, + arg_u64_1(NULL, "cn", "", "Visa2k card ID"), + arg_lit0(NULL, "q5", "optional - specify writing to Q5/T5555 tag"), + arg_lit0(NULL, "em", "optional - specify writing to EM4305/4469 tag"), + arg_param_end + }; + CLIExecWithReturn(ctx, Cmd, argtable, false); - id = param_get32ex(Cmd, 0, 0, 10); + uint32_t id = arg_get_u32_def(ctx, 1, 0); + bool q5 = arg_get_lit(ctx, 2); + bool em = arg_get_lit(ctx, 3); + CLIParserFree(ctx); + if (q5 && em) { + PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time"); + return PM3_EINVARG; + } + + uint32_t blocks[4] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_64 | T55x7_ST_TERMINATOR | 3 << T55x7_MAXBLOCK_SHIFT, VISA2k_BL0CK1, 0}; char cardtype[16] = {"T55x7"}; // Q5 - bool q5 = tolower(param_getchar(Cmd, 1)) == 'q'; if (q5) { blocks[0] = T5555_FIXED | T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(64) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT; snprintf(cardtype, sizeof(cardtype), "Q5/T5555"); } // EM4305 - bool em = tolower(param_getchar(Cmd, 1)) == 'e'; if (em) { blocks[0] = EM4305_VISA2000_CONFIG_BLOCK; snprintf(cardtype, sizeof(cardtype), "EM4305/4469"); } - if (q5 && em) { - PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time"); - return PM3_EINVARG; - } - blocks[2] = id; blocks[3] = (visa_parity(id) << 4) | visa_chksum(id); @@ -215,22 +217,31 @@ static int CmdVisa2kClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf visa2000 read`") " to verify"); + PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf visa2000 reader`") " to verify"); return res; } static int CmdVisa2kSim(const char *Cmd) { - uint32_t id = 0; - char cmdp = tolower(param_getchar(Cmd, 0)); - if (strlen(Cmd) == 0 || cmdp == 'h') - return usage_lf_visa2k_sim(); + CLIParserContext *ctx; + CLIParserInit(&ctx, "lf visa2000 sim", + "Enables simulation of visa2k card with specified card number.\n" + "Simulation runs until the button is pressed or another USB command is issued.\n", + "lf visa2000 sim --cn 1337" + ); - id = param_get32ex(Cmd, 0, 0, 10); + void *argtable[] = { + arg_param_begin, + arg_u64_1(NULL, "cn", "", "Visa2k card ID"), + arg_param_end + }; + CLIExecWithReturn(ctx, Cmd, argtable, false); + uint32_t id = arg_get_u32_def(ctx, 1, 0); + CLIParserFree(ctx); - PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId: %u", id); + PrintAndLogEx(SUCCESS, "Simulating Visa2000 - CardId:" _YELLOW_("%u"), id); - uint32_t blocks[3] = { BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) }; + uint32_t blocks[3] = { VISA2k_BL0CK1, id, (visa_parity(id) << 4) | visa_chksum(id) }; uint8_t bs[96]; for (int i = 0; i < 3; ++i) @@ -257,11 +268,11 @@ static int CmdVisa2kSim(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "This help"}, - {"demod", CmdVisa2kDemod, AlwaysAvailable, "demodulate an VISA2000 tag from the GraphBuffer"}, - {"read", CmdVisa2kRead, IfPm3Lf, "attempt to read and extract tag data from the antenna"}, - {"clone", CmdVisa2kClone, IfPm3Lf, "clone Visa2000 tag to T55x7 or Q5/T5555"}, - {"sim", CmdVisa2kSim, IfPm3Lf, "simulate Visa2000 tag"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, + {"demod", CmdVisa2kDemod, AlwaysAvailable, "demodulate an VISA2000 tag from the GraphBuffer"}, + {"reader", CmdVisa2kReader, IfPm3Lf, "attempt to read and extract tag data from the antenna"}, + {"clone", CmdVisa2kClone, IfPm3Lf, "clone Visa2000 tag to T55x7 or Q5/T5555"}, + {"sim", CmdVisa2kSim, IfPm3Lf, "simulate Visa2000 tag"}, {NULL, NULL, NULL, NULL} };