github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-14 17:13:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

style

Browse source
This commit is contained in:
iceman1001 2023-06-02 10:45:04 +02:00
parent 1107c214c5
commit 97eb0238b1
17 changed files with 191 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/pm3line_vocabulory.h
View file

@ -360,7 +360,8 @@ const static vocabulory_t vocabulory[] = {
{ 0, "hf mf gsave" }, { 0, "hf mf gsave" },
{ 0, "hf mf gsetblk" }, { 0, "hf mf gsetblk" },
{ 0, "hf mf gview" }, { 0, "hf mf gview" },
{ 0, "hf mf gdmconfig" }, { 0, "hf mf gdmcfg" },
{ 0, "hf mf gdmsetcfg" },
{ 0, "hf mf gdmsetblk" }, { 0, "hf mf gdmsetblk" },
{ 0, "hf mf ndefformat" }, { 0, "hf mf ndefformat" },
{ 0, "hf mf ndefread" }, { 0, "hf mf ndefread" },

89
doc/commands.json
View file

@ -1354,9 +1354,10 @@
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-f, --file <fn> (optional) filename, if no <name> UID will be used as filename" "-f, --file <fn> (optional) filename, if no <name> UID will be used as filename",
"--ns no save to file"
], ],
"usage": "hf 14b dump [-h] [-f <fn>]" "usage": "hf 14b dump [-h] [-f <fn>] [--ns]"
}, },
"hf 14b help": { "hf 14b help": {
"command": "hf 14b help", "command": "hf 14b help",
@ -4218,9 +4219,10 @@
"--mini MIFARE Classic Mini / S20", "--mini MIFARE Classic Mini / S20",
"--1k MIFARE Classic 1k / S50 (def)", "--1k MIFARE Classic 1k / S50 (def)",
"--2k MIFARE Classic/Plus 2k", "--2k MIFARE Classic/Plus 2k",
"--4k MIFARE Classic 4k / S70" "--4k MIFARE Classic 4k / S70",
"--ns no save to file"
], ],
"usage": "hf mf dump [-h] [-f <fn>] [-k <fn>] [--mini] [--1k] [--2k] [--4k]" "usage": "hf mf dump [-h] [-f <fn>] [-k <fn>] [--mini] [--1k] [--2k] [--4k] [--ns]"
}, },
"hf mf ecfill": { "hf mf ecfill": {
"command": "hf mf ecfill", "command": "hf mf ecfill",
@ -4368,9 +4370,10 @@
"--1k MIFARE Classic 1k / S50 (def)", "--1k MIFARE Classic 1k / S50 (def)",
"--2k MIFARE Classic/Plus 2k", "--2k MIFARE Classic/Plus 2k",
"--4k MIFARE Classic 4k / S70", "--4k MIFARE Classic 4k / S70",
"-v, --verbose verbose output" "-v, --verbose verbose output",
"--sk Save extracted keys to file"
], ],
"usage": "hf mf eview [-hv] [--mini] [--1k] [--2k] [--4k]" "usage": "hf mf eview [-hv] [--mini] [--1k] [--2k] [--4k] [--sk]"
}, },
"hf mf fchk": { "hf mf fchk": {
"command": "hf mf fchk", "command": "hf mf fchk",
@ -4400,18 +4403,18 @@
], ],
"usage": "hf mf fchk [-h] [-k <hex>]... [--mini] [--1k] [--2k] [--4k] [--emu] [--dump] [--mem] [-f <fn>]" "usage": "hf mf fchk [-h] [-k <hex>]... [--mini] [--1k] [--2k] [--4k] [--emu] [--dump] [--mem] [-f <fn>]"
}, },
"hf mf gdmconfig": { "hf mf gdmcfg": {
"command": "hf mf gdmconfig", "command": "hf mf gdmcfg",
"description": "Get configuration data from magic gen4 GDM card.", "description": "Get configuration data from magic gen4 GDM card.",
"notes": [ "notes": [
"hf mf gdmconfig" "hf mf gdmcfg"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-k, --key <hex> key 6 bytes" "-k, --key <hex> key 6 bytes"
], ],
"usage": "hf mf gdmconfig [-h] [-k <hex>]" "usage": "hf mf gdmcfg [-h] [-k <hex>]"
}, },
"hf mf gdmsetblk": { "hf mf gdmsetblk": {
"command": "hf mf gdmsetblk", "command": "hf mf gdmsetblk",
@ -4431,6 +4434,19 @@
], ],
"usage": "hf mf gdmsetblk [-hab] --blk <dec> [-d <hex>] [-k <hex>] [--force]" "usage": "hf mf gdmsetblk [-hab] --blk <dec> [-d <hex>] [-k <hex>] [--force]"
}, },
"hf mf gdmsetcfg": {
"command": "hf mf gdmsetcfg",
"description": "Set configuration data on a magic gen4 GDM card",
"notes": [
"hf mf gdmsetcfg -d 850000000000000000005A5A00000008"
],
"offline": false,
"options": [
"-h, --help This help",
"-d, --data <hex> bytes to write, 16 hex bytes"
],
"usage": "hf mf gdmsetcfg [-h] -d <hex>"
},
"hf mf gen3blk": { "hf mf gen3blk": {
"command": "hf mf gen3blk", "command": "hf mf gen3blk",
"description": "Overwrite full manufacturer block for magic Gen3 card - You can specify part of manufacturer block as 4/7-bytes for UID change only", "description": "Overwrite full manufacturer block for magic Gen3 card - You can specify part of manufacturer block as 4/7-bytes for UID change only",
@ -4902,6 +4918,7 @@
"hf mf value --blk 16 -k FFFFFFFFFFFF --inc 10", "hf mf value --blk 16 -k FFFFFFFFFFFF --inc 10",
"hf mf value --blk 16 -k FFFFFFFFFFFF -b --dec 10", "hf mf value --blk 16 -k FFFFFFFFFFFF -b --dec 10",
"hf mf value --blk 16 -k FFFFFFFFFFFF -b --get", "hf mf value --blk 16 -k FFFFFFFFFFFF -b --get",
"hf mf value --blk 16 -k FFFFFFFFFFFF --res --transfer 30 --tk FFFFFFFFFFFF -> transfer block 16 value to block 30 (even if block can't be incremented by ACL)",
"hf mf value --get -d 87D612007829EDFF87D6120011EE11EE" "hf mf value --get -d 87D612007829EDFF87D6120011EE11EE"
], ],
"offline": true, "offline": true,
@ -4910,14 +4927,19 @@
"-k, --key <hex> key, 6 hex bytes", "-k, --key <hex> key, 6 hex bytes",
"-a input key type is key A (def)", "-a input key type is key A (def)",
"-b input key type is key B", "-b input key type is key B",
"--inc <dec> Incremenet value by X (0 - 2147483647)", "--inc <dec> Increment value by X (0 - 2147483647)",
"--dec <dec> Dcrement value by X (0 - 2147483647)", "--dec <dec> Decrement value by X (0 - 2147483647)",
"--set <dec> Set value to X (-2147483647 - 2147483647)", "--set <dec> Set value to X (-2147483647 - 2147483647)",
"--transfer <dec> Transfer value to other block (after inc/dec/restore)",
"--tkey <hex> transfer key, 6 hex bytes (if transfer is preformed to other sector)",
"--ta transfer key type is key A (def)",
"--tb transfer key type is key B",
"--get Get value from block", "--get Get value from block",
"--res Restore (copy value to card buffer, should be used with --transfer)",
"--blk <dec> block number", "--blk <dec> block number",
"-d, --data <hex> block data to extract values from (16 hex bytes)" "-d, --data <hex> block data to extract values from (16 hex bytes)"
], ],
"usage": "hf mf value [-hab] [-k <hex>] [--inc <dec>] [--dec <dec>] [--set <dec>] [--get] [--blk <dec>] [-d <hex>]" "usage": "hf mf value [-hab] [-k <hex>] [--inc <dec>] [--dec <dec>] [--set <dec>] [--transfer <dec>] [--tkey <hex>] [--ta] [--tb] [--get] [--res] [--blk <dec>] [-d <hex>]"
}, },
"hf mf view": { "hf mf view": {
"command": "hf mf view", "command": "hf mf view",
@ -4929,9 +4951,10 @@
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-f, --file <fn> filename of dump", "-f, --file <fn> filename of dump",
"-v, --verbose verbose output" "-v, --verbose verbose output",
"--sk Save extracted keys to file"
], ],
"usage": "hf mf view [-hv] -f <fn>" "usage": "hf mf view [-hv] -f <fn> [--sk]"
}, },
"hf mf wipe": { "hf mf wipe": {
"command": "hf mf wipe", "command": "hf mf wipe",
@ -6146,7 +6169,7 @@
}, },
"hf mfp commitp": { "hf mfp commitp": {
"command": "hf mfp commitp", "command": "hf mfp commitp",
"description": "Executes Commit Perso command. Can be used in SL0 mode only.", "description": "Executes Commit Perso command. Can be used in SL0 mode only. OBS! This command will not be executed if CardConfigKey, CardMasterKey and L3SwitchKey AES keys are not written.",
"notes": [ "notes": [
"hf mfp commitp" "hf mfp commitp"
], ],
@ -6246,9 +6269,9 @@
"-b, --keyb Use key B (def: keyA)", "-b, --keyb Use key B (def: keyA)",
"-p, --plain Plain communication mode between reader and card", "-p, --plain Plain communication mode between reader and card",
"--blk <0..255> Block number", "--blk <0..255> Block number",
"--key <hex> Key, 16 hex bytes" "-k, --key <hex> Key, 16 hex bytes"
], ],
"usage": "hf mfp rdbl [-hvbp] [-n <dec>] --blk <0..255> [--key <hex>]" "usage": "hf mfp rdbl [-hvbp] [-n <dec>] --blk <0..255> [-k <hex>]"
}, },
"hf mfp rdsc": { "hf mfp rdsc": {
"command": "hf mfp rdsc", "command": "hf mfp rdsc",
@ -6335,9 +6358,10 @@
"-k, --key <hex> Key for authentication (UL-C 16 bytes, EV1/NTAG 4 bytes)", "-k, --key <hex> Key for authentication (UL-C 16 bytes, EV1/NTAG 4 bytes)",
"-l Swap entered key's endianness", "-l Swap entered key's endianness",
"-p, --page <dec> Manually set start page number to start from", "-p, --page <dec> Manually set start page number to start from",
"-q, --qty <dec> Manually set number of pages to dump" "-q, --qty <dec> Manually set number of pages to dump",
"--ns no save to file"
], ],
"usage": "hf mfu dump [-hl] [-f <fn>] [-k <hex>] [-p <dec>] [-q <dec>]" "usage": "hf mfu dump [-hl] [-f <fn>] [-k <hex>] [-p <dec>] [-q <dec>] [--ns]"
}, },
"hf mfu eload": { "hf mfu eload": {
"command": "hf mfu eload", "command": "hf mfu eload",
@ -6565,7 +6589,7 @@
}, },
"hf mfu tamper": { "hf mfu tamper": {
"command": "hf mfu tamper", "command": "hf mfu tamper",
"description": "Set the congiguration of the NTAG 213TT tamper feature Supports: NTAG 213TT", "description": "Set the configuration of the NTAG 213TT tamper feature Supports: NTAG 213TT",
"notes": [ "notes": [
"hf mfu tamper -e -> enable tamper feature", "hf mfu tamper -e -> enable tamper feature",
"hf mfu tamper -d -> disable tamper feature", "hf mfu tamper -d -> disable tamper feature",
@ -8039,15 +8063,19 @@
"command": "lf em 4x50 brute", "command": "lf em 4x50 brute",
"description": "Tries to bruteforce the password of a EM4x50 card. Function can be stopped by pressing pm3 button.", "description": "Tries to bruteforce the password of a EM4x50 card. Function can be stopped by pressing pm3 button.",
"notes": [ "notes": [
"lf em 4x50 brute --first 12330000 --last 12340000 -> tries pwds from 0x12330000 to 0x1234000000" "lf em 4x50 brute --mode range --begin 12330000 --end 12340000 -> tries pwds from 0x12330000 to 0x12340000",
"lf em 4x50 brute --mode charset --digits --uppercase -> tries all combinations of ASCII codes for digits and uppercase letters"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"--first <hex> first password (start), 4 bytes, lsb", "--mode <str> Bruteforce mode (range|charset)",
"--last <hex> last password (stop), 4 bytes, lsb" "--begin <hex> Range mode - start of the key range",
"--end <hex> Range mode - end of the key range",
"--digits Charset mode - include ASCII codes for digits",
"--uppercase Charset mode - include ASCII codes for uppercase letters"
], ],
"usage": "lf em 4x50 brute [-h] --first <hex> --last <hex>" "usage": "lf em 4x50 brute [-h] --mode <str> [--begin <hex>] [--end <hex>] [--digits] [--uppercase]"
}, },
"lf em 4x50 chk": { "lf em 4x50 chk": {
"command": "lf em 4x50 chk", "command": "lf em 4x50 chk",
@ -10199,12 +10227,13 @@
"-f, --file <fn> filename (default is generated on blk 0)", "-f, --file <fn> filename (default is generated on blk 0)",
"-o, --override override, force pwd read despite danger to card", "-o, --override override, force pwd read despite danger to card",
"-p, --pwd <hex> password (4 hex bytes)", "-p, --pwd <hex> password (4 hex bytes)",
"--ns no save",
"--r0 downlink - fixed bit length", "--r0 downlink - fixed bit length",
"--r1 downlink - long leading reference", "--r1 downlink - long leading reference",
"--r2 downlink - leading zero", "--r2 downlink - leading zero",
"--r3 downlink - 1 of 4 coding reference" "--r3 downlink - 1 of 4 coding reference"
], ],
"usage": "lf t55xx dump [-ho] [-f <fn>] [-p <hex>] [--r0] [--r1] [--r2] [--r3]" "usage": "lf t55xx dump [-ho] [-f <fn>] [-p <hex>] [--ns] [--r0] [--r1] [--r2] [--r3]"
}, },
"lf t55xx help": { "lf t55xx help": {
"command": "lf t55xx help", "command": "lf t55xx help",
@ -10867,7 +10896,7 @@
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-f, --file <fn> SPIFFS file to view", "-f, --file <fn> SPIFFS file to view",
"-c, --cols <dec> column breaks (def 32)" "-c, --cols <dec> column breaks (def 16)"
], ],
"usage": "mem spiffs view [-h] -f <fn> [-c <dec>]" "usage": "mem spiffs view [-h] -f <fn> [-c <dec>]"
}, },
@ -11592,7 +11621,7 @@
}, },
"script help": { "script help": {
"command": "script help", "command": "script help",
"description": "This is a feature to run Lua/Cmd/Python scripts. You can place scripts within the luascripts/cmdscripts/pyscripts folders. --------------------------------------------------------------------------------------- script list available offline: yes", "description": "This is a feature to run Lua/Cmd scripts. You can place scripts within the luascripts/cmdscripts folders. --------------------------------------------------------------------------------------- script list available offline: yes",
"notes": [], "notes": [],
"offline": true, "offline": true,
"options": [], "options": [],
@ -11987,8 +12016,8 @@
} }
}, },
"metadata": { "metadata": {
"commands_extracted": 754, "commands_extracted": 755,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-03-26T15:04:49" "extracted_on": "2023-06-02T08:44:26"
} }
} }

7
doc/commands.md
View file

@ -523,7 +523,8 @@ Check column "offline" for their availability.
|`hf mf gsave `|N |`Save dump from card into file or emulator` |`hf mf gsave `|N |`Save dump from card into file or emulator`
|`hf mf gsetblk `|N |`Write block to card` |`hf mf gsetblk `|N |`Write block to card`
|`hf mf gview `|N |`View card` |`hf mf gview `|N |`View card`
|`hf mf gdmconfig `|N |`Read config block from card` |`hf mf gdmcfg `|N |`Read config block from card`
|`hf mf gdmsetcfg `|N |`Write config block to card`
|`hf mf gdmsetblk `|N |`Write block to card` |`hf mf gdmsetblk `|N |`Write block to card`
|`hf mf ndefformat `|N |`Format MIFARE Classic Tag as NFC Tag` |`hf mf ndefformat `|N |`Format MIFARE Classic Tag as NFC Tag`
|`hf mf ndefread `|N |`Read and print NDEF records from card` |`hf mf ndefread `|N |`Read and print NDEF records from card`
@ -568,7 +569,7 @@ Check column "offline" for their availability.
|`hf mfu restore `|N |`Restore a dump onto a MFU MAGIC tag` |`hf mfu restore `|N |`Restore a dump onto a MFU MAGIC tag`
|`hf mfu view `|Y |`Display content from tag dump file` |`hf mfu view `|Y |`Display content from tag dump file`
|`hf mfu wrbl `|N |`Write block` |`hf mfu wrbl `|N |`Write block`
|`hf mfu tamper `|N |`Cofigure the tamper feature on an NTAG 213TT` |`hf mfu tamper `|N |`Configure the tamper feature on an NTAG 213TT`
|`hf mfu eload `|N |`Load Ultralight dump file into emulator memory` |`hf mfu eload `|N |`Load Ultralight dump file into emulator memory`
|`hf mfu esave `|N |`Save Ultralight dump file from emulator memory` |`hf mfu esave `|N |`Save Ultralight dump file from emulator memory`
|`hf mfu eview `|N |`View emulator memory` |`hf mfu eview `|N |`View emulator memory`
@ -874,7 +875,7 @@ Check column "offline" for their availability.
|command |offline |description |command |offline |description
|------- |------- |----------- |------- |------- |-----------
|`lf em 4x50 help `|Y |`This help` |`lf em 4x50 help `|Y |`This help`
|`lf em 4x50 brute `|N |`Simple bruteforce attack to find password` |`lf em 4x50 brute `|N |`Bruteforce attack to find password`
|`lf em 4x50 chk `|N |`Check passwords from dictionary` |`lf em 4x50 chk `|N |`Check passwords from dictionary`
|`lf em 4x50 dump `|N |`Dump EM4x50 tag` |`lf em 4x50 dump `|N |`Dump EM4x50 tag`
|`lf em 4x50 info `|N |`Tag information` |`lf em 4x50 info `|N |`Tag information`