diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c index 85044f27b..90a3b3ebf 100644 --- a/client/src/cmdhf.c +++ b/client/src/cmdhf.c @@ -410,11 +410,11 @@ static command_t CommandTable[] = { {"waveshare", CmdHFWaveshare, AlwaysAvailable, "{ Waveshare NFC ePaper... }"}, {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("General") " ---------------------"}, {"help", CmdHelp, AlwaysAvailable, "This help"}, - {"list", CmdTraceList, AlwaysAvailable, "List protocol data in trace buffer"}, + {"list", CmdTraceList, AlwaysAvailable, "List protocol data in trace buffer"}, {"plot", CmdHFPlot, IfPm3Hfplot, "Plot signal"}, {"tune", CmdHFTune, IfPm3Present, "Continuously measure HF antenna tuning"}, {"search", CmdHFSearch, AlwaysAvailable, "Search for known HF tags"}, - {"sniff", CmdHFSniff, IfPm3Hfsniff, " Generic HF Sniff"}, + {"sniff", CmdHFSniff, IfPm3Hfsniff, "Generic HF Sniff"}, {NULL, NULL, NULL, NULL} }; diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index b4b2f4245..7b90a5bbf 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -3488,36 +3488,36 @@ static int CmdHFiClassAutopwn(const char *Cmd) { static command_t CommandTable[] = { {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("operations") " ---------------------"}, - {"help", CmdHelp, AlwaysAvailable, " This help"}, -// {"clone", CmdHFiClassClone, IfPm3Iclass, "[*] Create a HID credential to Picopass / iCLASS tag"}, - {"dump", CmdHFiClassDump, IfPm3Iclass, "[*] Dump Picopass / iCLASS tag to file"}, - {"info", CmdHFiClassInfo, AlwaysAvailable, " Tag information"}, - {"list", CmdHFiClassList, AlwaysAvailable, " List iclass history"}, - {"rdbl", CmdHFiClass_ReadBlock, IfPm3Iclass, "[*] Read Picopass / iCLASS block"}, - {"reader", CmdHFiClassReader, IfPm3Iclass, " Act like an Picopass / iCLASS reader"}, - {"restore", CmdHFiClassRestore, IfPm3Iclass, "[*] Restore a dump file onto a Picopass / iCLASS tag"}, - {"sniff", CmdHFiClassSniff, IfPm3Iclass, " Eavesdrop Picopass / iCLASS communication"}, - {"wrbl", CmdHFiClass_WriteBlock, IfPm3Iclass, "[*] Write Picopass / iCLASS block"}, + {"help", CmdHelp, AlwaysAvailable, "This help"}, +// {"clone", CmdHFiClassClone, IfPm3Iclass, "Create a HID credential to Picopass / iCLASS tag"}, + {"dump", CmdHFiClassDump, IfPm3Iclass, "Dump Picopass / iCLASS tag to file"}, + {"info", CmdHFiClassInfo, AlwaysAvailable, "Tag information"}, + {"list", CmdHFiClassList, AlwaysAvailable, "List iclass history"}, + {"rdbl", CmdHFiClass_ReadBlock, IfPm3Iclass, "Read Picopass / iCLASS block"}, + {"reader", CmdHFiClassReader, IfPm3Iclass, "Act like an Picopass / iCLASS reader"}, + {"restore", CmdHFiClassRestore, IfPm3Iclass, "Restore a dump file onto a Picopass / iCLASS tag"}, + {"sniff", CmdHFiClassSniff, IfPm3Iclass, "Eavesdrop Picopass / iCLASS communication"}, + {"wrbl", CmdHFiClass_WriteBlock, IfPm3Iclass, "Write Picopass / iCLASS block"}, {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("recovery") " ---------------------"}, -// {"autopwn", CmdHFiClassAutopwn, IfPm3Iclass, "[*] Automatic key recovery tool for iCLASS"}, - {"chk", CmdHFiClassCheckKeys, IfPm3Iclass, "[*] Check keys"}, - {"loclass", CmdHFiClass_loclass, AlwaysAvailable, "[*] Use loclass to perform bruteforce reader attack"}, - {"lookup", CmdHFiClassLookUp, AlwaysAvailable, "[*] Uses authentication trace to check for key in dictionary file"}, +// {"autopwn", CmdHFiClassAutopwn, IfPm3Iclass, "Automatic key recovery tool for iCLASS"}, + {"chk", CmdHFiClassCheckKeys, IfPm3Iclass, "Check keys"}, + {"loclass", CmdHFiClass_loclass, AlwaysAvailable, "Use loclass to perform bruteforce reader attack"}, + {"lookup", CmdHFiClassLookUp, AlwaysAvailable, "Uses authentication trace to check for key in dictionary file"}, {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("simulation") " ---------------------"}, - {"sim", CmdHFiClassSim, IfPm3Iclass, "[*] Simulate iCLASS tag"}, - {"eload", CmdHFiClassELoad, IfPm3Iclass, "[*] Load Picopass / iCLASS dump file into emulator memory"}, - {"esave", CmdHFiClassESave, IfPm3Iclass, "[*] Save emulator memory to file"}, - {"eview", CmdHFiClassEView, IfPm3Iclass, "[.] View emulator memory"}, + {"sim", CmdHFiClassSim, IfPm3Iclass, "Simulate iCLASS tag"}, + {"eload", CmdHFiClassELoad, IfPm3Iclass, "Load Picopass / iCLASS dump file into emulator memory"}, + {"esave", CmdHFiClassESave, IfPm3Iclass, "Save emulator memory to file"}, + {"eview", CmdHFiClassEView, IfPm3Iclass, "View emulator memory"}, {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("utils") " ---------------------"}, - {"calcnewkey", CmdHFiClassCalcNewKey, AlwaysAvailable, "[*] Calc diversified keys (blocks 3 & 4) to write new keys"}, - {"encode", CmdHFiClassEncode, AlwaysAvailable, "[*] Encode binary wiegand to block 7"}, - {"encrypt", CmdHFiClassEncryptBlk, AlwaysAvailable, "[*] Encrypt given block data"}, - {"decrypt", CmdHFiClassDecrypt, AlwaysAvailable, "[*] Decrypt given block data or tag dump file" }, - {"managekeys", CmdHFiClassManageKeys, AlwaysAvailable, "[*] Manage keys to use with iclass commands"}, - {"permutekey", CmdHFiClassPermuteKey, IfPm3Iclass, " Permute function from 'heart of darkness' paper"}, - {"view", CmdHFiClassView, AlwaysAvailable, "[*] Display content from tag dump file"}, + {"calcnewkey", CmdHFiClassCalcNewKey, AlwaysAvailable, "Calc diversified keys (blocks 3 & 4) to write new keys"}, + {"encode", CmdHFiClassEncode, AlwaysAvailable, "Encode binary wiegand to block 7"}, + {"encrypt", CmdHFiClassEncryptBlk, AlwaysAvailable, "Encrypt given block data"}, + {"decrypt", CmdHFiClassDecrypt, AlwaysAvailable, "Decrypt given block data or tag dump file" }, + {"managekeys", CmdHFiClassManageKeys, AlwaysAvailable, "Manage keys to use with iclass commands"}, + {"permutekey", CmdHFiClassPermuteKey, IfPm3Iclass, "Permute function from 'heart of darkness' paper"}, + {"view", CmdHFiClassView, AlwaysAvailable, "Display content from tag dump file"}, {NULL, NULL, NULL, NULL} }; diff --git a/doc/commands.md b/doc/commands.md index fa960f973..347fdaaa8 100644 --- a/doc/commands.md +++ b/doc/commands.md @@ -121,7 +121,7 @@ Check column "offline" for their availability. |`hf plot `|N |`Plot signal` |`hf tune `|N |`Continuously measure HF antenna tuning` |`hf search `|Y |`Search for known HF tags` -|`hf sniff `|N |` Generic HF Sniff` +|`hf sniff `|N |`Generic HF Sniff` ### hf 14a @@ -260,29 +260,29 @@ Check column "offline" for their availability. |command |offline |description |------- |------- |----------- -|`hf iclass help `|Y |` This help` -|`hf iclass dump `|N |`[*] Dump Picopass / iCLASS tag to file` -|`hf iclass info `|Y |` Tag information` -|`hf iclass list `|Y |` List iclass history` -|`hf iclass rdbl `|N |`[*] Read Picopass / iCLASS block` -|`hf iclass reader `|N |` Act like an Picopass / iCLASS reader` -|`hf iclass restore `|N |`[*] Restore a dump file onto a Picopass / iCLASS tag` -|`hf iclass sniff `|N |` Eavesdrop Picopass / iCLASS communication` -|`hf iclass wrbl `|N |`[*] Write Picopass / iCLASS block` -|`hf iclass chk `|N |`[*] Check keys` -|`hf iclass loclass `|Y |`[*] Use loclass to perform bruteforce reader attack` -|`hf iclass lookup `|Y |`[*] Uses authentication trace to check for key in dictionary file` -|`hf iclass sim `|N |`[*] Simulate iCLASS tag` -|`hf iclass eload `|N |`[*] Load Picopass / iCLASS dump file into emulator memory` -|`hf iclass esave `|N |`[*] Save emulator memory to file` -|`hf iclass eview `|N |`[.] View emulator memory` -|`hf iclass calcnewkey `|Y |`[*] Calc diversified keys (blocks 3 & 4) to write new keys` -|`hf iclass encode `|Y |`[*] Encode binary wiegand to block 7` -|`hf iclass encrypt `|Y |`[*] Encrypt given block data` -|`hf iclass decrypt `|Y |`[*] Decrypt given block data or tag dump file` -|`hf iclass managekeys `|Y |`[*] Manage keys to use with iclass commands` -|`hf iclass permutekey `|N |` Permute function from 'heart of darkness' paper` -|`hf iclass view `|Y |`[*] Display content from tag dump file` +|`hf iclass help `|Y |`This help` +|`hf iclass dump `|N |`Dump Picopass / iCLASS tag to file` +|`hf iclass info `|Y |`Tag information` +|`hf iclass list `|Y |`List iclass history` +|`hf iclass rdbl `|N |`Read Picopass / iCLASS block` +|`hf iclass reader `|N |`Act like an Picopass / iCLASS reader` +|`hf iclass restore `|N |`Restore a dump file onto a Picopass / iCLASS tag` +|`hf iclass sniff `|N |`Eavesdrop Picopass / iCLASS communication` +|`hf iclass wrbl `|N |`Write Picopass / iCLASS block` +|`hf iclass chk `|N |`Check keys` +|`hf iclass loclass `|Y |`Use loclass to perform bruteforce reader attack` +|`hf iclass lookup `|Y |`Uses authentication trace to check for key in dictionary file` +|`hf iclass sim `|N |`Simulate iCLASS tag` +|`hf iclass eload `|N |`Load Picopass / iCLASS dump file into emulator memory` +|`hf iclass esave `|N |`Save emulator memory to file` +|`hf iclass eview `|N |`View emulator memory` +|`hf iclass calcnewkey `|Y |`Calc diversified keys (blocks 3 & 4) to write new keys` +|`hf iclass encode `|Y |`Encode binary wiegand to block 7` +|`hf iclass encrypt `|Y |`Encrypt given block data` +|`hf iclass decrypt `|Y |`Decrypt given block data or tag dump file` +|`hf iclass managekeys `|Y |`Manage keys to use with iclass commands` +|`hf iclass permutekey `|N |`Permute function from 'heart of darkness' paper` +|`hf iclass view `|Y |`Display content from tag dump file` ### hf legic @@ -508,14 +508,14 @@ Check column "offline" for their availability. |`hw help `|Y |`This help` |`hw connect `|Y |`connect Proxmark3 to serial port` |`hw dbg `|N |`Set Proxmark3 debug level` -|`hw detectreader `|N |`['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)` +|`hw detectreader `|N |`Detect external reader field` |`hw fpgaoff `|N |`Set FPGA off` -|`hw lcd `|N |` -- Send command/data to LCD` +|`hw lcd `|N |`Send command/data to LCD` |`hw lcdreset `|N |`Hardware reset LCD` |`hw ping `|N |`Test if the Proxmark3 is responsive` -|`hw readmem `|N |`[address] -- Read memory at decimal address from flash` +|`hw readmem `|N |`Read memory at decimal address from flash` |`hw reset `|N |`Reset the Proxmark3` -|`hw setlfdivisor `|N |`<19 - 255> -- Drive LF antenna at 12MHz/(divisor+1)` +|`hw setlfdivisor `|N |`Drive LF antenna at 12 MHz / (divisor + 1)` |`hw setmux `|N |`Set the ADC mux to a specific value` |`hw standalone `|N |`Jump to the standalone mode` |`hw status `|N |`Show runtime status information about the connected Proxmark3` diff --git a/doc/md/Use_of_Proxmark/3_Commands-and-Features.md b/doc/md/Use_of_Proxmark/3_Commands-and-Features.md index 195468002..d2786956a 100644 --- a/doc/md/Use_of_Proxmark/3_Commands-and-Features.md +++ b/doc/md/Use_of_Proxmark/3_Commands-and-Features.md @@ -9,7 +9,7 @@ Please make sure you've gone through the following pages firstly: ## To get interactive help -As seen before, for basic help type `help`. Or for help on a set of sub commands type the command followed by `help`. For example `hf mf help`. Many commands uses the `h` parameter to show a help text. +As seen before, for basic help type `help`. Or for help on a set of sub commands type the command followed by `help`. For example `hf mf help`. Many commands uses the `h` / `-h` parameter to show a help text. ## New Features in RDV4