From 783d97bd09386057421e86948b3a2068735e3979 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 2 Mar 2020 13:59:41 +0100 Subject: [PATCH] Chg: added hint texts to lf clone commands --- client/cmdlf.c | 2 +- client/cmdlfawid.c | 5 ++++- client/cmdlfem4x.c | 12 +++++++++--- client/cmdlffdx.c | 5 ++++- client/cmdlfgallagher.c | 5 ++++- client/cmdlfhid.c | 3 ++- client/cmdlfindala.c | 5 ++++- client/cmdlfio.c | 5 ++++- client/cmdlfkeri.c | 5 ++++- client/cmdlfmotorola.c | 5 ++++- client/cmdlfnedap.c | 2 ++ client/cmdlfnexwatch.c | 6 ++++-- client/cmdlft55xx.c | 1 - 13 files changed, 46 insertions(+), 15 deletions(-) diff --git a/client/cmdlf.c b/client/cmdlf.c index b83ed0c89..f153ba1c3 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -1339,10 +1339,10 @@ static command_t CommandTable[] = { {"io", CmdLFIO, AlwaysAvailable, "{ ioProx RFIDs... }"}, {"jablotron", CmdLFJablotron, AlwaysAvailable, "{ Jablotron RFIDs... }"}, {"keri", CmdLFKeri, AlwaysAvailable, "{ KERI RFIDs... }"}, + {"motorola", CmdLFMotorola, AlwaysAvailable, "{ Motorola RFIDs... }"}, {"nedap", CmdLFNedap, AlwaysAvailable, "{ Nedap RFIDs... }"}, {"nexwatch", CmdLFNEXWATCH, AlwaysAvailable, "{ NexWatch RFIDs... }"}, {"noralsy", CmdLFNoralsy, AlwaysAvailable, "{ Noralsy RFIDs... }"}, - {"motorola", CmdLFMotorola, AlwaysAvailable, "{ Motorola RFIDs... }"}, {"pac", CmdLFPac, AlwaysAvailable, "{ PAC/Stanley RFIDs... }"}, {"paradox", CmdLFParadox, AlwaysAvailable, "{ Paradox RFIDs... }"}, {"pcf7931", CmdLFPCF7931, AlwaysAvailable, "{ PCF7931 CHIPs... }"}, diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index 38c3675d1..9bcf9e874 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -422,7 +422,10 @@ static int CmdAWIDClone(const char *Cmd) { PrintAndLogEx(INFO, "Preparing to clone AWID %u to T55x7 with FC: %u, CN: %u", fmtlen, fc, cn); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf awid read`") "to verify"); + return res; } static int CmdAWIDBrute(const char *Cmd) { diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index a8d7e06e3..9b7fe51de 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -700,6 +700,8 @@ static int CmdEM410xWrite(const char *Cmd) { } SendCommandMIX(CMD_LF_EM410X_WRITE, card, (uint32_t)(id >> 32), (uint32_t)id, NULL, 0); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf em 410x_read`") "to verify"); return PM3_SUCCESS; } @@ -1037,6 +1039,9 @@ static int CmdEM4x50Write(const char *Cmd) { uint8_t ctmp = tolower(param_getchar(Cmd, 0)); if (ctmp == 'h') return usage_lf_em4x50_write(); PrintAndLogEx(NORMAL, "no implemented yet"); +// +// PrintAndLogEx(SUCCESS, "Done"); +// PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf em 4x50_read`") "to verify"); return PM3_SUCCESS; } @@ -1434,9 +1439,10 @@ static int CmdEM4x05Write(const char *Cmd) { uint32_t dummy = 0; int status = demodEM4x05resp(&dummy); if (status == PM3_SUCCESS) - PrintAndLogEx(NORMAL, "Write " _GREEN_("Verified")); - else - PrintAndLogEx(NORMAL, "Write could " _RED_("not") "be verified"); + PrintAndLogEx(SUCCESS, "Success writing to tag"); + + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf em 4x05_read`") "to verify"); return status; } static int CmdEM4x05Wipe(const char *Cmd) { diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index 2f3f81d1d..11ec2dd64 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -301,7 +301,10 @@ static int CmdFdxClone(const char *Cmd) { PrintAndLogEx(INFO, "Preparing to clone FDX-B to T55x7 with animal ID: %04u-%"PRIu64, countryid, animalid); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf fdx read`") "to verify"); + return res; } static int CmdFdxSim(const char *Cmd) { diff --git a/client/cmdlfgallagher.c b/client/cmdlfgallagher.c index ef28f1326..e44682e2b 100644 --- a/client/cmdlfgallagher.c +++ b/client/cmdlfgallagher.c @@ -178,7 +178,10 @@ static int CmdGallagherClone(const char *Cmd) { PrintAndLogEx(INFO, "Preparing to clone Gallagher to T55x7 with raw hex"); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf gallagher read`") "to verify"); + return res; } static int CmdGallagherSim(const char *Cmd) { diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c index 3a4d16cf3..dbe027dc3 100644 --- a/client/cmdlfhid.c +++ b/client/cmdlfhid.c @@ -345,7 +345,8 @@ static int CmdHIDClone(const char *Cmd) { clearCommandBuffer(); SendCommandMIX(CMD_LF_HID_CLONE, hi2, hi, lo, longid, sizeof(longid)); - PrintAndLogEx(INFO, "Clone command sent. Try "_YELLOW_("'lf hid read'") " to verify"); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf hid read`") "to verify"); return PM3_SUCCESS; } diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c index 9aa98524c..01eb4b8f8 100644 --- a/client/cmdlfindala.c +++ b/client/cmdlfindala.c @@ -620,7 +620,10 @@ static int CmdIndalaClone(const char *Cmd) { } print_blocks(blocks, max); - return clone_t55xx_tag(blocks, max); + int res = clone_t55xx_tag(blocks, max); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf indala read`") "to verify"); + return res; } static command_t CommandTable[] = { diff --git a/client/cmdlfio.c b/client/cmdlfio.c index 1a25fca17..994c69a7d 100644 --- a/client/cmdlfio.c +++ b/client/cmdlfio.c @@ -275,7 +275,10 @@ static int CmdIOProxClone(const char *Cmd) { PrintAndLogEx(INFO, "Preparing to clone IOProx to T55x7 with Version: %u FC: %u, CN: %u", version, fc, cn); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf io read`") "to verify"); + return res; } static command_t CommandTable[] = { diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c index 4a0c3c8fd..3c7863361 100644 --- a/client/cmdlfkeri.c +++ b/client/cmdlfkeri.c @@ -280,7 +280,10 @@ static int CmdKeriClone(const char *Cmd) { print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf keri read`") "to verify"); + return res; } static int CmdKeriSim(const char *Cmd) { diff --git a/client/cmdlfmotorola.c b/client/cmdlfmotorola.c index 9f0ee1f41..c34b48d8e 100644 --- a/client/cmdlfmotorola.c +++ b/client/cmdlfmotorola.c @@ -177,7 +177,10 @@ static int CmdMotorolaClone(const char *Cmd) { blocks[2] = bytes_to_num(data + 4, 4); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf motorola read`") "to verify"); + return res; } static int CmdMotorolaSim(const char *Cmd) { diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c index c3d6d1ace..a1d23cd91 100644 --- a/client/cmdlfnedap.c +++ b/client/cmdlfnedap.c @@ -475,6 +475,8 @@ static int CmdLFNedapClone(const char *Cmd) { } else { PrintAndLogEx(NORMAL, ""); } + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf nedap read`") "to verify"); return res; } diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c index 68be0e0bc..d288eeadc 100644 --- a/client/cmdlfnexwatch.c +++ b/client/cmdlfnexwatch.c @@ -158,8 +158,10 @@ static int CmdNexWatchClone(const char *Cmd) { PrintAndLogEx(INFO, "Preparing to clone NexWatch to T55x7 with raw hex"); print_blocks(blocks, ARRAYLEN(blocks)); - return clone_t55xx_tag(blocks, ARRAYLEN(blocks)); - + int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); + PrintAndLogEx(SUCCESS, "Done"); + PrintAndLogEx(INFO, "Hint: try " _YELLOW_("`lf nexwatch read`") "to verify"); + return res; } static int CmdNexWatchSim(const char *Cmd) { diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index f25626d94..c88b8a051 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -1028,7 +1028,6 @@ void T55xx_Print_DownlinkMode(uint8_t downlink_mode) { PrintAndLogEx(NORMAL, msg); } - static int CmdT55xxDetect(const char *Cmd) { bool errors = false;