From 811f76785d2ce8aa83b7377ccb782175aca88580 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 22 Aug 2022 12:25:25 +0200 Subject: [PATCH] textual --- client/src/cmddata.c | 2 +- client/src/cmdhf14b.c | 21 +++++++++++++-------- client/src/cmdhffelica.c | 12 ++++++------ client/src/cmdhfmfp.c | 2 +- client/src/cmdlfawid.c | 2 +- client/src/cmdlfem4x50.c | 2 +- client/src/cmdsmartcard.c | 4 ++-- 7 files changed, 25 insertions(+), 20 deletions(-) diff --git a/client/src/cmddata.c b/client/src/cmddata.c index 448ddb4e2..5b5055dd9 100644 --- a/client/src/cmddata.c +++ b/client/src/cmddata.c @@ -1817,7 +1817,7 @@ static int CmdSamples(const char *Cmd) { void *argtable[] = { arg_param_begin, arg_int0("n", NULL, "", "num of samples (512 - 40000)"), - arg_lit0("v", "verbose", "verbose"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c index 14237c0fe..3150da049 100644 --- a/client/src/cmdhf14b.c +++ b/client/src/cmdhf14b.c @@ -290,7 +290,7 @@ static int CmdHF14BCmdRaw(const char *Cmd) { arg_lit0("c", "crc", "calculate and append CRC"), arg_lit0("r", NULL, "do not read response from card"), arg_int0("t", "timeout", "", "timeout in ms"), - arg_lit0("v", "verbose", "verbose"), + arg_lit0("v", "verbose", "verbose output"), arg_str0("d", "data", "", "data, bytes to send"), arg_param_end }; @@ -931,7 +931,7 @@ static int CmdHF14Binfo(const char *Cmd) { void *argtable[] = { arg_param_begin, arg_lit0("s", "aidsearch", "checks if AIDs from aidlist.json is present on the card and prints information about found AIDs"), - arg_lit0("v", "verbose", "verbose"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -1186,12 +1186,12 @@ static int CmdHF14BReader(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_lit0("s", "silent", "silent (no messages)"), + arg_lit0("v", "verbose", "verbose output"), arg_lit0("@", NULL, "optional - continuous reader mode"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); - bool verbose = (arg_get_lit(ctx, 1) == false); + bool verbose = arg_get_lit(ctx, 1); bool cm = arg_get_lit(ctx, 2); CLIParserFree(ctx); @@ -2203,20 +2203,25 @@ int readHF14B(bool loop, bool verbose) { do { // try std 14b (atqb) if (HF14B_std_reader(verbose)) - return PM3_SUCCESS; + if (loop) + continue; // try ST Microelectronics 14b if (HF14B_st_reader(verbose)) - return PM3_SUCCESS; + if (loop) + continue; // try ASK CT 14b if (HF14B_ask_ct_reader(verbose)) - return PM3_SUCCESS; + if (loop) + continue; // try unknown 14b read commands (to be identified later) // could be read of calypso, CEPAS, moneo, or pico pass. if (HF14B_other_reader(verbose)) - return PM3_SUCCESS; + if (loop) + continue; + } while (loop && kbd_enter_pressed() == false); diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index c809633e1..773556543 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -591,7 +591,7 @@ static int CmdHFFelicaAuthentication1(const char *Cmd) { arg_str0(NULL, "sn", "", "number of service, 1 byte"), arg_str0(NULL, "scl", "", "service code list, 2 bytes"), arg_str0("k", "key", "", "3des key, 16 bytes"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -804,7 +804,7 @@ static int CmdHFFelicaAuthentication2(const char *Cmd) { arg_str0("i", NULL, "", "set custom IDm"), arg_str0("c", "cc", "", "M3c card challenge, 8 bytes"), arg_str0("k", "key", "", "3des M3c decryption key, 16 bytes"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -970,7 +970,7 @@ static int CmdHFFelicaWritePlain(const char *Cmd) { arg_str0(NULL, "scl", "", "service code list"), arg_str0(NULL, "bn", "", "number of block"), arg_str0(NULL, "ble", "", "block list element (def 2|3 bytes)"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -1136,7 +1136,7 @@ static int CmdHFFelicaReadPlain(const char *Cmd) { arg_str0(NULL, "scl", "", "service code list"), arg_str0(NULL, "bn", "", "number of block"), arg_str0(NULL, "ble", "", "block list element (def 2|3 bytes)"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -1364,7 +1364,7 @@ static int CmdHFFelicaRequestSpecificationVersion(const char *Cmd) { arg_param_begin, arg_str0("i", NULL, "", "set custom IDm"), arg_str0("r", NULL, "", "set custom reserve"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -1471,7 +1471,7 @@ static int CmdHFFelicaResetMode(const char *Cmd) { arg_param_begin, arg_str0("i", NULL, "", "set custom IDm"), arg_str0("r", NULL, "", "set custom reserve"), - arg_lit0("v", "verbose", "verbose helptext"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index fac52f531..9de9d40c1 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -461,7 +461,7 @@ static int CmdHFMFPWritePerso(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_lit0("v", "verbose", "Verbose mode"), + arg_lit0("v", "verbose", "Verbose output"), arg_str1(NULL, "ki", "", " Key number, 2 hex bytes"), arg_str0(NULL, "key", "", " Key, 16 hex bytes"), arg_param_end diff --git a/client/src/cmdlfawid.c b/client/src/cmdlfawid.c index 06b9c520c..11db5fc83 100644 --- a/client/src/cmdlfawid.c +++ b/client/src/cmdlfawid.c @@ -487,7 +487,7 @@ static int CmdAWIDBrute(const char *Cmd) { arg_u64_1(NULL, "fc", "", "8|16bit value facility code"), arg_u64_0(NULL, "cn", "", "optional - card number to start with, max 65535"), arg_u64_0(NULL, "delay", "", "optional - delay betweens attempts in ms. Default 1000ms"), - arg_lit0("v", "verbose", "verbose logging, show all tries"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, false); diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c index abc8810fd..3bed45d1d 100644 --- a/client/src/cmdlfem4x50.c +++ b/client/src/cmdlfem4x50.c @@ -628,7 +628,7 @@ int CmdEM4x50Info(const char *Cmd) { void *argtable[] = { arg_param_begin, arg_str0("p", "pwd", "", "password, 4 hex bytes, lsb"), - arg_lit0("v", "verbose", "additional output of data section"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c index c6bfe648d..495b20015 100644 --- a/client/src/cmdsmartcard.c +++ b/client/src/cmdsmartcard.c @@ -670,7 +670,7 @@ static int CmdSmartInfo(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_lit0("v", "verbose", "verbose"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -748,7 +748,7 @@ static int CmdSmartReader(const char *Cmd) { void *argtable[] = { arg_param_begin, - arg_lit0("v", "verbose", "verbose"), + arg_lit0("v", "verbose", "verbose output"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true);