From 32bb9511ec5aefb2cd9785d2c1322676d858b436 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 2 May 2019 00:02:38 +0200 Subject: [PATCH] Replace WITH_LF by dynamic detection in client --- client/cmdlf.c | 18 +++++++++--------- client/cmdlfawid.c | 10 +++++----- client/cmdlfcotag.c | 2 +- client/cmdlfem4x.c | 28 ++++++++++++++-------------- client/cmdlffdx.c | 8 ++++---- client/cmdlfguard.c | 6 +++--- client/cmdlfhid.c | 10 +++++----- client/cmdlfindala.c | 6 +++--- client/cmdlfio.c | 6 +++--- client/cmdlfjablotron.c | 6 +++--- client/cmdlfkeri.c | 6 +++--- client/cmdlfnedap.c | 12 ++++++------ client/cmdlfnexwatch.c | 2 +- client/cmdlfnoralsy.c | 8 ++++---- client/cmdlfpac.c | 4 ++-- client/cmdlfparadox.c | 6 +++--- client/cmdlfpcf7931.c | 4 ++-- client/cmdlfpresco.c | 6 +++--- client/cmdlfpyramid.c | 10 +++++----- client/cmdlfsecurakey.c | 8 ++++---- client/cmdlft55xx.c | 34 +++++++++++++++++----------------- client/cmdlfti.c | 4 ++-- client/cmdlfviking.c | 6 +++--- client/cmdlfvisa2000.c | 6 +++--- 24 files changed, 108 insertions(+), 108 deletions(-) diff --git a/client/cmdlf.c b/client/cmdlf.c index 49ee94ba5..9330b2ff4 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -974,17 +974,17 @@ static command_t CommandTable[] = { {"t55xx", CmdLFT55XX, AlwaysAvailable, "{ T55xx CHIPs... }"}, {"viking", CmdLFViking, AlwaysAvailable, "{ Viking RFIDs... }"}, {"visa2000", CmdLFVisa2k, AlwaysAvailable, "{ Visa2000 RFIDs... }"}, - {"config", CmdLFSetConfig, IfPm3Present, "Set config for LF sampling, bit/sample, decimation, frequency"}, - {"cmdread", CmdLFCommandRead, IfPm3Present, " <'0' period> <'1' period> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"}, + {"config", CmdLFSetConfig, IfPm3Lf, "Set config for LF sampling, bit/sample, decimation, frequency"}, + {"cmdread", CmdLFCommandRead, IfPm3Lf, " <'0' period> <'1' period> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"}, {"flexdemod", CmdFlexdemod, AlwaysAvailable, "Demodulate samples for FlexPass"}, - {"read", CmdLFRead, IfPm3Present, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"}, + {"read", CmdLFRead, IfPm3Lf, "['s' silent] Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"}, {"search", CmdLFfind, AlwaysAvailable, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) \n\t\t-- 'u' to search for unknown tags"}, - {"sim", CmdLFSim, IfPm3Present, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"}, - {"simask", CmdLFaskSim, IfPm3Present, "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d ] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"}, - {"simfsk", CmdLFfskSim, IfPm3Present, "[c ] [i] [H ] [L ] [d ] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"}, - {"simpsk", CmdLFpskSim, IfPm3Present, "[1|2|3] [c ] [i] [r ] [d ] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"}, - {"simbidir", CmdLFSimBidir, IfPm3Present, "Simulate LF tag (with bidirectional data transmission between reader and tag)"}, - {"sniff", CmdLFSniff, IfPm3Present, "Sniff LF traffic between reader and tag"}, + {"sim", CmdLFSim, IfPm3Lf, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"}, + {"simask", CmdLFaskSim, IfPm3Lf, "[clock] [invert <1|0>] [biphase/manchester/raw <'b'|'m'|'r'>] [msg separator 's'] [d ] \n\t\t-- Simulate LF ASK tag from demodbuffer or input"}, + {"simfsk", CmdLFfskSim, IfPm3Lf, "[c ] [i] [H ] [L ] [d ] \n\t\t-- Simulate LF FSK tag from demodbuffer or input"}, + {"simpsk", CmdLFpskSim, IfPm3Lf, "[1|2|3] [c ] [i] [r ] [d ] \n\t\t-- Simulate LF PSK tag from demodbuffer or input"}, + {"simbidir", CmdLFSimBidir, IfPm3Lf, "Simulate LF tag (with bidirectional data transmission between reader and tag)"}, + {"sniff", CmdLFSniff, IfPm3Lf, "Sniff LF traffic between reader and tag"}, {"vchdemod", CmdVchDemod, AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c index abecb6791..046df1ce9 100644 --- a/client/cmdlfawid.c +++ b/client/cmdlfawid.c @@ -492,11 +492,11 @@ static int CmdAWIDBrute(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "this help"}, - {"demod", CmdAWIDDemod, IfPm3Present, "demodulate an AWID FSK tag from the GraphBuffer"}, - {"read", CmdAWIDRead, IfPm3Present, "attempt to read and extract tag data"}, - {"clone", CmdAWIDClone, IfPm3Present, "clone AWID to T55x7"}, - {"sim", CmdAWIDSim, IfPm3Present, "simulate AWID tag"}, - {"brute", CmdAWIDBrute, IfPm3Present, "Bruteforce card number against reader"}, + {"demod", CmdAWIDDemod, AlwaysAvailable, "demodulate an AWID FSK tag from the GraphBuffer"}, + {"read", CmdAWIDRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"clone", CmdAWIDClone, IfPm3Lf, "clone AWID to T55x7"}, + {"sim", CmdAWIDSim, IfPm3Lf, "simulate AWID tag"}, + {"brute", CmdAWIDBrute, IfPm3Lf, "Bruteforce card number against reader"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c index 2bb92f32a..9875d969f 100644 --- a/client/cmdlfcotag.c +++ b/client/cmdlfcotag.c @@ -105,7 +105,7 @@ static int CmdCOTAGRead(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdCOTAGDemod, AlwaysAvailable, "Tries to decode a COTAG signal"}, - {"read", CmdCOTAGRead, IfPm3Present, "Attempt to read and extract tag data"}, + {"read", CmdCOTAGRead, IfPm3Lf, "Attempt to read and extract tag data"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index be00d01ba..dc06f02d5 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -1465,21 +1465,21 @@ static int CmdEM4x05Info(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, - //{"410x_demod", CmdEMdemodASK, 0, "Extract ID from EM410x tag on antenna)"}, + //{"410x_demod", CmdEMdemodASK, IfPm3Lf, "Extract ID from EM410x tag on antenna)"}, {"410x_demod", CmdEM410xDemod, AlwaysAvailable, "demodulate a EM410x tag from the GraphBuffer"}, - {"410x_read", CmdEM410xRead, IfPm3Present, "attempt to read and extract tag data"}, - {"410x_sim", CmdEM410xSim, IfPm3Present, "simulate EM410x tag"}, - {"410x_brute", CmdEM410xBrute, IfPm3Present, "reader bruteforce attack by simulating EM410x tags"}, - {"410x_watch", CmdEM410xWatch, IfPm3Present, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"}, - {"410x_spoof", CmdEM410xWatchnSpoof, IfPm3Present, "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" }, - {"410x_write", CmdEM410xWrite, IfPm3Present, "write EM410x UID to T5555(Q5) or T55x7 tag"}, - {"4x05_dump", CmdEM4x05Dump, IfPm3Present, "dump EM4x05/EM4x69 tag"}, - {"4x05_info", CmdEM4x05Info, IfPm3Present, "tag information EM4x05/EM4x69"}, - {"4x05_read", CmdEM4x05Read, IfPm3Present, "read word data from EM4x05/EM4x69"}, - {"4x05_write", CmdEM4x05Write, IfPm3Present, "write word data to EM4x05/EM4x69"}, - {"4x50_dump", CmdEM4x50Dump, IfPm3Present, "dump EM4x50 tag"}, - {"4x50_read", CmdEM4x50Read, IfPm3Present, "read word data from EM4x50"}, - {"4x50_write", CmdEM4x50Write, IfPm3Present, "write word data to EM4x50"}, + {"410x_read", CmdEM410xRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"410x_sim", CmdEM410xSim, IfPm3Lf, "simulate EM410x tag"}, + {"410x_brute", CmdEM410xBrute, IfPm3Lf, "reader bruteforce attack by simulating EM410x tags"}, + {"410x_watch", CmdEM410xWatch, IfPm3Lf, "watches for EM410x 125/134 kHz tags (option 'h' for 134)"}, + {"410x_spoof", CmdEM410xWatchnSpoof, IfPm3Lf, "watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" }, + {"410x_write", CmdEM410xWrite, IfPm3Lf, "write EM410x UID to T5555(Q5) or T55x7 tag"}, + {"4x05_dump", CmdEM4x05Dump, IfPm3Lf, "dump EM4x05/EM4x69 tag"}, + {"4x05_info", CmdEM4x05Info, IfPm3Lf, "tag information EM4x05/EM4x69"}, + {"4x05_read", CmdEM4x05Read, IfPm3Lf, "read word data from EM4x05/EM4x69"}, + {"4x05_write", CmdEM4x05Write, IfPm3Lf, "write word data to EM4x05/EM4x69"}, + {"4x50_dump", CmdEM4x50Dump, IfPm3Lf, "dump EM4x50 tag"}, + {"4x50_read", CmdEM4x50Read, IfPm3Lf, "read word data from EM4x50"}, + {"4x50_write", CmdEM4x50Write, IfPm3Lf, "write word data to EM4x50"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index 48155e867..6ad487888 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -320,11 +320,11 @@ static int CmdFdxSim(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "this help"}, + {"help", CmdHelp, AlwaysAvailable, "this help"}, {"demod", CmdFdxDemod, AlwaysAvailable, "demodulate a FDX-B ISO11784/85 tag from the GraphBuffer"}, - {"read", CmdFdxRead, IfPm3Present, "attempt to read and extract tag data"}, - {"clone", CmdFdxClone, IfPm3Present, "clone animal ID tag to T55x7 (or to q5/T5555)"}, - {"sim", CmdFdxSim, IfPm3Present, "simulate Animal ID tag"}, + {"read", CmdFdxRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"clone", CmdFdxClone, IfPm3Lf, "clone animal ID tag to T55x7 (or to q5/T5555)"}, + {"sim", CmdFdxSim, IfPm3Lf, "simulate Animal ID tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c index 663311bbb..420398b66 100644 --- a/client/cmdlfguard.c +++ b/client/cmdlfguard.c @@ -217,9 +217,9 @@ static int CmdGuardSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "this help"}, {"demod", CmdGuardDemod, AlwaysAvailable, "demodulate a G Prox II tag from the GraphBuffer"}, - {"read", CmdGuardRead, IfPm3Present, "attempt to read and extract tag data from the antenna"}, - {"clone", CmdGuardClone, IfPm3Present, "clone Guardall tag"}, - {"sim", CmdGuardSim, IfPm3Present, "simulate Guardall tag"}, + {"read", CmdGuardRead, IfPm3Lf, "attempt to read and extract tag data from the antenna"}, + {"clone", CmdGuardClone, IfPm3Lf, "clone Guardall tag"}, + {"sim", CmdGuardSim, IfPm3Lf, "simulate Guardall tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c index a92f1fc00..13ab591fa 100644 --- a/client/cmdlfhid.c +++ b/client/cmdlfhid.c @@ -595,12 +595,12 @@ static int CmdHIDBrute(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "this help"}, - {"demod", CmdHIDDemod, IfPm3Present, "demodulate HID Prox tag from the GraphBuffer"}, - {"read", CmdHIDRead, IfPm3Present, "attempt to read and extract tag data"}, - {"clone", CmdHIDClone, IfPm3Present, "clone HID to T55x7"}, - {"sim", CmdHIDSim, IfPm3Present, "simulate HID tag"}, + {"demod", CmdHIDDemod, AlwaysAvailable, "demodulate HID Prox tag from the GraphBuffer"}, + {"read", CmdHIDRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"clone", CmdHIDClone, IfPm3Lf, "clone HID to T55x7"}, + {"sim", CmdHIDSim, IfPm3Lf, "simulate HID tag"}, {"wiegand", CmdHIDWiegand, AlwaysAvailable, "convert facility code/card number to Wiegand code"}, - {"brute", CmdHIDBrute, IfPm3Present, "bruteforce card number against reader"}, + {"brute", CmdHIDBrute, IfPm3Lf, "bruteforce card number against reader"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c index bedf18cb6..d1d99db78 100644 --- a/client/cmdlfindala.c +++ b/client/cmdlfindala.c @@ -460,9 +460,9 @@ static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "this help"}, {"demod", CmdIndalaDemod, AlwaysAvailable, "demodulate an indala tag (PSK1) from GraphBuffer"}, {"altdemod", CmdIndalaDemodAlt, AlwaysAvailable, "alternative method to Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"}, - {"read", CmdIndalaRead, IfPm3Present, "read an Indala Prox tag from the antenna"}, - {"clone", CmdIndalaClone, IfPm3Present, "clone Indala to T55x7"}, - {"sim", CmdIndalaSim, IfPm3Present, "simulate Indala tag"}, + {"read", CmdIndalaRead, IfPm3Lf, "read an Indala Prox tag from the antenna"}, + {"clone", CmdIndalaClone, IfPm3Lf, "clone Indala to T55x7"}, + {"sim", CmdIndalaSim, IfPm3Lf, "simulate Indala tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfio.c b/client/cmdlfio.c index 17b6c70b8..16214052b 100644 --- a/client/cmdlfio.c +++ b/client/cmdlfio.c @@ -259,9 +259,9 @@ static int CmdIOProxClone(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "this help"}, {"demod", CmdIOProxDemod, AlwaysAvailable, "demodulate an IOProx tag from the GraphBuffer"}, - {"read", CmdIOProxRead, AlwaysAvailable, "attempt to read and extract tag data"}, - {"clone", CmdIOProxClone, IfPm3Present, "clone IOProx to T55x7"}, - {"sim", CmdIOProxSim, IfPm3Present, "simulate IOProx tag"}, + {"read", CmdIOProxRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"clone", CmdIOProxClone, IfPm3Lf, "clone IOProx to T55x7"}, + {"sim", CmdIOProxSim, IfPm3Lf, "simulate IOProx tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c index 2d69dfff4..c31923510 100644 --- a/client/cmdlfjablotron.c +++ b/client/cmdlfjablotron.c @@ -195,9 +195,9 @@ static int CmdJablotronSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdJablotronDemod, AlwaysAvailable, "Demodulate an Jablotron tag from the GraphBuffer"}, - {"read", CmdJablotronRead, IfPm3Present, "Attempt to read and extract tag data from the antenna"}, - {"clone", CmdJablotronClone, IfPm3Present, "clone jablotron tag"}, - {"sim", CmdJablotronSim, IfPm3Present, "simulate jablotron tag"}, + {"read", CmdJablotronRead, IfPm3Lf, "Attempt to read and extract tag data from the antenna"}, + {"clone", CmdJablotronClone, IfPm3Lf, "clone jablotron tag"}, + {"sim", CmdJablotronSim, IfPm3Lf, "simulate jablotron tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c index 5e03aaa75..8d0111914 100644 --- a/client/cmdlfkeri.c +++ b/client/cmdlfkeri.c @@ -190,9 +190,9 @@ static int CmdKeriSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdKeriDemod, AlwaysAvailable, "Demodulate an KERI tag from the GraphBuffer"}, - {"read", CmdKeriRead, IfPm3Present, "Attempt to read and extract tag data from the antenna"}, - {"clone", CmdKeriClone, IfPm3Present, "clone KERI to T55x7"}, - {"sim", CmdKeriSim, IfPm3Present, "simulate KERI tag"}, + {"read", CmdKeriRead, IfPm3Lf, "Attempt to read and extract tag data from the antenna"}, + {"clone", CmdKeriClone, IfPm3Lf, "clone KERI to T55x7"}, + {"sim", CmdKeriSim, IfPm3Lf, "simulate KERI tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c index 035c40919..e4a09ad34 100644 --- a/client/cmdlfnedap.c +++ b/client/cmdlfnedap.c @@ -294,12 +294,12 @@ static int CmdLFNedapChk(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "this help"}, - {"demod", CmdLFNedapDemod, IfPm3Present, "demodulate an Nedap tag from the GraphBuffer"}, - {"read", CmdLFNedapRead, IfPm3Present, "attempt to read and extract tag data"}, -// {"clone", CmdLFNedapClone,0, " clone nedap tag"}, - {"sim", CmdLFNedapSim, IfPm3Present, "simulate nedap tag"}, - {"chk", CmdLFNedapChk, AlwaysAvailable, "calculate Nedap Checksum "}, + {"help", CmdHelp, AlwaysAvailable, "this help"}, + {"demod", CmdLFNedapDemod, AlwaysAvailable, "demodulate an Nedap tag from the GraphBuffer"}, + {"read", CmdLFNedapRead, IfPm3Lf, "attempt to read and extract tag data"}, +// {"clone", CmdLFNedapClone, IfPm3Lf, " clone nedap tag"}, + {"sim", CmdLFNedapSim, IfPm3Lf, "simulate nedap tag"}, + {"chk", CmdLFNedapChk, AlwaysAvailable, "calculate Nedap Checksum "}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c index aeb85974d..6c8e9e143 100644 --- a/client/cmdlfnexwatch.c +++ b/client/cmdlfnexwatch.c @@ -77,7 +77,7 @@ static int CmdNexWatchRead(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdNexWatchDemod, AlwaysAvailable, "Demodulate a NexWatch tag (nexkey, quadrakey) from the GraphBuffer"}, - {"read", CmdNexWatchRead, IfPm3Present, "Attempt to Read and Extract tag data from the antenna"}, + {"read", CmdNexWatchRead, IfPm3Lf, "Attempt to Read and Extract tag data from the antenna"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c index 4ebe7adc6..417ac534f 100644 --- a/client/cmdlfnoralsy.c +++ b/client/cmdlfnoralsy.c @@ -196,11 +196,11 @@ static int CmdNoralsySim(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "This help"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdNoralsyDemod, AlwaysAvailable, "Demodulate an Noralsy tag from the GraphBuffer"}, - {"read", CmdNoralsyRead, IfPm3Present, "Attempt to read and extract tag data from the antenna"}, - {"clone", CmdNoralsyClone, IfPm3Present, "clone Noralsy to T55x7"}, - {"sim", CmdNoralsySim, IfPm3Present, "simulate Noralsy tag"}, + {"read", CmdNoralsyRead, IfPm3Lf, "Attempt to read and extract tag data from the antenna"}, + {"clone", CmdNoralsyClone, IfPm3Lf, "clone Noralsy to T55x7"}, + {"sim", CmdNoralsySim, IfPm3Lf, "simulate Noralsy tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfpac.c b/client/cmdlfpac.c index 7dc637e89..eb745abb3 100644 --- a/client/cmdlfpac.c +++ b/client/cmdlfpac.c @@ -57,9 +57,9 @@ static int CmdPacRead(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "This help"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdPacDemod, AlwaysAvailable, "Demodulate an PAC tag from the GraphBuffer"}, - {"read", CmdPacRead, IfPm3Present, "Attempt to read and extract tag data from the antenna"}, + {"read", CmdPacRead, IfPm3Lf, "Attempt to read and extract tag data from the antenna"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c index 32bc25c98..6b836c846 100644 --- a/client/cmdlfparadox.c +++ b/client/cmdlfparadox.c @@ -144,9 +144,9 @@ static int CmdParadoxSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdParadoxDemod, AlwaysAvailable, "Demodulate a Paradox FSK tag from the GraphBuffer"}, - {"read", CmdParadoxRead, IfPm3Present, "Attempt to read and Extract tag data from the antenna"}, -// {"clone", CmdParadoxClone, 0, "clone paradox tag"}, - {"sim", CmdParadoxSim, IfPm3Present, "simulate paradox tag"}, + {"read", CmdParadoxRead, IfPm3Lf, "Attempt to read and Extract tag data from the antenna"}, +// {"clone", CmdParadoxClone, IfPm3Lf, "clone paradox tag"}, + {"sim", CmdParadoxSim, IfPm3Lf, "simulate paradox tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c index 189bc495e..1574cd033 100644 --- a/client/cmdlfpcf7931.c +++ b/client/cmdlfpcf7931.c @@ -158,8 +158,8 @@ static int CmdLFPCF7931Write(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, - {"read", CmdLFPCF7931Read, IfPm3Present, "Read content of a PCF7931 transponder"}, - {"write", CmdLFPCF7931Write, IfPm3Present, "Write data on a PCF7931 transponder."}, + {"read", CmdLFPCF7931Read, IfPm3Lf, "Read content of a PCF7931 transponder"}, + {"write", CmdLFPCF7931Write, IfPm3Lf, "Write data on a PCF7931 transponder."}, {"config", CmdLFPCF7931Config, AlwaysAvailable, "Configure the password, the tags initialization delay and time offsets (optional)"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c index 3a6b23722..e81a436fa 100644 --- a/client/cmdlfpresco.c +++ b/client/cmdlfpresco.c @@ -153,9 +153,9 @@ static int CmdPrescoSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, - {"read", CmdPrescoRead, IfPm3Present, "Attempt to read and Extract tag data"}, - {"clone", CmdPrescoClone, IfPm3Present, "clone presco tag"}, - {"sim", CmdPrescoSim, IfPm3Present, "simulate presco tag"}, + {"read", CmdPrescoRead, IfPm3Lf, "Attempt to read and Extract tag data"}, + {"clone", CmdPrescoClone, IfPm3Lf, "clone presco tag"}, + {"sim", CmdPrescoSim, IfPm3Lf, "simulate presco tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c index b2bc8e33b..351299204 100644 --- a/client/cmdlfpyramid.c +++ b/client/cmdlfpyramid.c @@ -276,11 +276,11 @@ static int CmdPyramidSim(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "this help"}, - {"demod", CmdPyramidDemod, IfPm3Present, "demodulate a Pyramid FSK tag from the GraphBuffer"}, - {"read", CmdPyramidRead, IfPm3Present, "attempt to read and extract tag data"}, - {"clone", CmdPyramidClone, IfPm3Present, "clone pyramid tag"}, - {"sim", CmdPyramidSim, IfPm3Present, "simulate pyramid tag"}, + {"help", CmdHelp, AlwaysAvailable, "this help"}, + {"demod", CmdPyramidDemod, AlwaysAvailable, "demodulate a Pyramid FSK tag from the GraphBuffer"}, + {"read", CmdPyramidRead, IfPm3Lf, "attempt to read and extract tag data"}, + {"clone", CmdPyramidClone, IfPm3Lf, "clone pyramid tag"}, + {"sim", CmdPyramidSim, IfPm3Lf, "simulate pyramid tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c index 3629cd9b0..6da3e474b 100644 --- a/client/cmdlfsecurakey.c +++ b/client/cmdlfsecurakey.c @@ -100,11 +100,11 @@ static int CmdSecurakeyRead(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "This help"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdSecurakeyDemod, AlwaysAvailable, "Demodulate an Securakey tag from the GraphBuffer"}, - {"read", CmdSecurakeyRead, IfPm3Present, "Attempt to read and extract tag data from the antenna"}, - //{"clone", CmdSecurakeyClone,0, "clone Securakey tag"}, - //{"sim", CmdSecurakeydSim, 0, "simulate Securakey tag"}, + {"read", CmdSecurakeyRead, IfPm3Lf, "Attempt to read and extract tag data from the antenna"}, + //{"clone", CmdSecurakeyClone, IfPm3Lf, "clone Securakey tag"}, + //{"sim", CmdSecurakeydSim, IfPm3Lf, "simulate Securakey tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 8ec3de2d4..cb21ef215 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -2302,23 +2302,23 @@ static int CmdT55xxSetDeviceConfig(const char *Cmd) { } static command_t CommandTable[] = { - {"help", CmdHelp, AlwaysAvailable, "This help"}, - {"bruteforce", CmdT55xxBruteForce, IfPm3Present, " [i <*.dic>] Simple bruteforce attack to find password"}, - {"config", CmdT55xxSetConfig, AlwaysAvailable, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"}, - {"chk", CmdT55xxChkPwds, AlwaysAvailable, "Check passwords"}, - {"detect", CmdT55xxDetect, AlwaysAvailable, "[1] Try detecting the tag modulation from reading the configuration block."}, - {"deviceconfig", CmdT55xxSetDeviceConfig, AlwaysAvailable, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"}, - {"p1detect", CmdT55xxDetectPage1, AlwaysAvailable, "[1] Try detecting if this is a t55xx tag by reading page 1"}, - {"dump", CmdT55xxDump, IfPm3Present, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"}, - {"info", CmdT55xxInfo, AlwaysAvailable, "[1] Show T55x7 configuration data (page 0/ blk 0)"}, - {"read", CmdT55xxReadBlock, IfPm3Present, "b p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"}, - {"resetread", CmdResetRead, IfPm3Present, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"}, - {"recoverpw", CmdT55xxRecoverPW, IfPm3Present, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"}, - {"special", special, IfPm3Present, "Show block changes with 64 different offsets"}, - {"trace", CmdT55xxReadTrace, AlwaysAvailable, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"}, - {"wakeup", CmdT55xxWakeUp, IfPm3Present, "Send AOR wakeup command"}, - {"wipe", CmdT55xxWipe, IfPm3Present, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"}, - {"write", CmdT55xxWriteBlock, IfPm3Present, "b d p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, + {"bruteforce", CmdT55xxBruteForce, IfPm3Lf, " [i <*.dic>] Simple bruteforce attack to find password"}, + {"config", CmdT55xxSetConfig, AlwaysAvailable, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"}, + {"chk", CmdT55xxChkPwds, IfPm3Lf, "Check passwords"}, + {"detect", CmdT55xxDetect, AlwaysAvailable, "[1] Try detecting the tag modulation from reading the configuration block."}, + {"deviceconfig", CmdT55xxSetDeviceConfig, IfPm3Lf, "Set/Get T55XX device configuration (startgap, writegap, write0, write1, readgap"}, + {"p1detect", CmdT55xxDetectPage1, IfPm3Lf, "[1] Try detecting if this is a t55xx tag by reading page 1"}, + {"dump", CmdT55xxDump, IfPm3Lf, "[password] [o] Dump T55xx card block 0-7. Optional [password], [override]"}, + {"info", CmdT55xxInfo, AlwaysAvailable, "[1] Show T55x7 configuration data (page 0/ blk 0)"}, + {"read", CmdT55xxReadBlock, IfPm3Lf, "b p [password] [o] [1] -- Read T55xx block data. Optional [p password], [override], [page1]"}, + {"resetread", CmdResetRead, IfPm3Lf, "Send Reset Cmd then lf read the stream to attempt to identify the start of it (needs a demod and/or plot after)"}, + {"recoverpw", CmdT55xxRecoverPW, IfPm3Lf, "[password] Try to recover from bad password write from a cloner. Only use on PW protected chips!"}, + {"special", special, IfPm3Lf, "Show block changes with 64 different offsets"}, + {"trace", CmdT55xxReadTrace, AlwaysAvailable, "[1] Show T55x7 traceability data (page 1/ blk 0-1)"}, + {"wakeup", CmdT55xxWakeUp, IfPm3Lf, "Send AOR wakeup command"}, + {"wipe", CmdT55xxWipe, IfPm3Lf, "[q] Wipe a T55xx tag and set defaults (will destroy any data on tag)"}, + {"write", CmdT55xxWriteBlock, IfPm3Lf, "b d p [password] [1] -- Write T55xx block data. Optional [p password], [page1]"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfti.c b/client/cmdlfti.c index 0889be200..3c6b22ed1 100644 --- a/client/cmdlfti.c +++ b/client/cmdlfti.c @@ -301,8 +301,8 @@ static int CmdTIWrite(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdTIDemod, AlwaysAvailable, "Demodulate raw bits for TI-type LF tag from the GraphBuffer"}, - {"read", CmdTIRead, IfPm3Present, "Read and decode a TI 134 kHz tag"}, - {"write", CmdTIWrite, IfPm3Present, "Write new data to a r/w TI 134 kHz tag"}, + {"read", CmdTIRead, IfPm3Lf, "Read and decode a TI 134 kHz tag"}, + {"write", CmdTIWrite, IfPm3Lf, "Write new data to a r/w TI 134 kHz tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c index 3f6e91eae..d21c30076 100644 --- a/client/cmdlfviking.c +++ b/client/cmdlfviking.c @@ -123,9 +123,9 @@ static int CmdVikingSim(const char *Cmd) { static command_t CommandTable[] = { {"help", CmdHelp, AlwaysAvailable, "This help"}, {"demod", CmdVikingDemod, AlwaysAvailable, "Demodulate a Viking tag from the GraphBuffer"}, - {"read", CmdVikingRead, IfPm3Present, "Attempt to read and Extract tag data from the antenna"}, - {"clone", CmdVikingClone, IfPm3Present, "<8 digit ID number> clone viking tag"}, - {"sim", CmdVikingSim, IfPm3Present, "<8 digit ID number> simulate viking tag"}, + {"read", CmdVikingRead, IfPm3Lf, "Attempt to read and Extract tag data from the antenna"}, + {"clone", CmdVikingClone, IfPm3Lf, "<8 digit ID number> clone viking tag"}, + {"sim", CmdVikingSim, IfPm3Lf, "<8 digit ID number> simulate viking tag"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c index 348a9adeb..f0b7c7c13 100644 --- a/client/cmdlfvisa2000.c +++ b/client/cmdlfvisa2000.c @@ -205,9 +205,9 @@ 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, IfPm3Present, "attempt to read and extract tag data from the antenna"}, - {"clone", CmdVisa2kClone, IfPm3Present, "clone Visa2000 to t55x7"}, - {"sim", CmdVisa2kSim, IfPm3Present, "simulate Visa2000 tag"}, + {"read", CmdVisa2kRead, IfPm3Lf, "attempt to read and extract tag data from the antenna"}, + {"clone", CmdVisa2kClone, IfPm3Lf, "clone Visa2000 to t55x7"}, + {"sim", CmdVisa2kSim, IfPm3Lf, "simulate Visa2000 tag"}, {NULL, NULL, NULL, NULL} };