X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/553bbf59b675caacbac3b1a086b1043bf09163b2..refs/pull/450/head:/client/cmdlfem4x.c?ds=sidebyside diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index e677919a..f5dfee35 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -289,19 +289,19 @@ int CmdEM410xSim(const char *Cmd) } int usage_lf_em410x_brute(void) { - PrintAndLog("Bruteforcing by emulating EM410x tag"); - PrintAndLog(""); - PrintAndLog("Usage: lf em 410xbrute [h] ids.txt [d 2000] [clock]"); - PrintAndLog("Options:"); - PrintAndLog(" h - this help"); - PrintAndLog(" ids.txt - file with UIDs in HEX format, one per line"); - PrintAndLog(" d (2000) - pause delay in milliseconds between UIDs simulation, default 1000 ms (optional)"); - PrintAndLog(" c (32) - clock (32|64), default 64 (optional)"); - PrintAndLog("samples:"); - PrintAndLog(" lf em 410xbrute ids.txt"); - PrintAndLog(" lf em 410xbrute ids.txt c 32"); - PrintAndLog(" lf em 410xbrute ids.txt d 3000"); - PrintAndLog(" lf em 410xbrute ids.txt d 3000 32"); + PrintAndLog("Bruteforcing by emulating EM410x tag"); + PrintAndLog(""); + PrintAndLog("Usage: lf em 410xbrute [h] ids.txt [d 2000] [c clock]"); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" ids.txt - file with UIDs in HEX format, one per line"); + PrintAndLog(" d (2000) - pause delay in milliseconds between UIDs simulation, default 1000 ms (optional)"); + PrintAndLog(" c (32) - clock (32|64), default 64 (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 410xbrute ids.txt"); + PrintAndLog(" lf em 410xbrute ids.txt c 32"); + PrintAndLog(" lf em 410xbrute ids.txt d 3000"); + PrintAndLog(" lf em 410xbrute ids.txt d 3000 c 32"); return 0; } @@ -405,7 +405,7 @@ int CmdEM410xBrute(const char *Cmd) return 0; } - sprintf(testuid, "%010lX", bytes_to_num(uidBlock + 5*c, 5)); + sprintf(testuid, "%010" PRIX64, bytes_to_num(uidBlock + 5*c, 5)); PrintAndLog("Bruteforce %d / %d: simulating UID %s, clock %d", c + 1, uidcnt, testuid, clock); ConstructEM410xEmulGraph(testuid, clock); @@ -606,7 +606,7 @@ int EM4x50Read(const char *Cmd, bool verbose) char tmp2[20]; int phaseoff; high = low = 0; - memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64); + memset(tmpbuff, 0, sizeof(tmpbuff)); // get user entry if any sscanf(Cmd, "%i %i", &clk, &invert); @@ -1339,7 +1339,7 @@ static command_t CommandTable[] = {"410xread", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"}, {"410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"}, {"410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"}, - {"410xbrute", CmdEM410xBrute, 0, "ids.txt [d (delay in ms)] [c (clock rate)] -- Bruteforcing by simulating EM410x tags (1 UID/s)"}, + {"410xbrute", CmdEM410xBrute, 0, "ids.txt [d (delay in ms)] [c (clock rate)] -- Reader bruteforce attack by simulating EM410x tags"}, {"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"}, {"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" }, {"410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},