github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make style

Browse source
This commit is contained in:
merlokk 2021-08-12 16:04:46 +03:00
commit 24665367ea
6 changed files with 141 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

103
doc/commands.json
View file

@ -973,7 +973,7 @@
},
"help": {
"command": "help",
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210808.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210812.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
"notes": [
"auto"
],
@ -3834,7 +3834,7 @@
"hf mf sim --1k -> mifare classic 1k (default)",
"hf mf sim --1k -u 0a0a0a0a -> mifare classic 1k with 4b uid",
"hf mf sim --1k -u 11223344556677 -> mifare classic 1k with 7b uid",
"hf mf sim --1k -u 11223344 -i --crack -> perform reader attack in interactive mode",
"hf mf sim --1k -u 11223344 -i -x -> perform reader attack in interactive mode",
"hf mf sim --2k -> mifare 2k",
"hf mf sim --4k -> mifare 4k"
],
@ -4068,7 +4068,7 @@
"offline": false,
"options": [
"-h, --help this help",
"-a, --aid <aid> use specific aid (3 hex bytes, big endian)",
"--aid <aid> use specific aid (3 hex bytes, big endian)",
"-k, --key <key> key for checking (hex 16 bytes)",
"-d, --dict <file> file with keys dictionary",
"--pattern1b check all 1-byte combinations of key (0000...0000, 0101...0101, 0202...0202, ...)",
@ -4077,9 +4077,10 @@
"-j, --json <file> json file to save keys",
"-v, --verbose verbose mode.",
"-f, --kdf <kdf> key derivation function (kdf) (0=none, 1=an10922, 2=gallagher)",
"-i, --kdfi <kdfi> kdf input (hex 1-31 bytes)"
"-i, --kdfi <kdfi> kdf input (hex 1-31 bytes)",
"-a, --apdu show apdu requests and responses"
],
"usage": "hf mfdes chk [-hv] [-a <aid>]... [-k <key>] [-d <file>] [--pattern1b] [--pattern2b] [--startp2b <pattern>] [-j <file>] [-f <kdf>] [-i <kdfi>]"
"usage": "hf mfdes chk [-hva] [--aid <aid>]... [-k <key>] [-d <file>] [--pattern1b] [--pattern2b] [--startp2b <pattern>] [-j <file>] [-f <kdf>] [-i <kdfi>]"
},
"hf mfdes chkeysettings": {
"command": "hf mfdes chkeysettings",
@ -4199,6 +4200,7 @@
"--rawtype/--rawdata have priority over the other settings. and with these parameters you can create any file. file id comes from parameters, all the rest data must be in the --rawdata parameter",
"--rawrights have priority over the separate rights settings.",
"key/mode/etc of the authentication depends on application settings",
"hf mfdes createfile --aid 123456 --fid 01 --isofid 0001 --size 000010 -> create file with iso id. authentication with defaults from `default` command",
"hf mfdes createfile --aid 123456 --fid 01 --rawtype 01 --rawdata 000100eeee000100 -> create file via sending rawdata to the card. can be used to create any type of file. authentication with defaults from `default` command",
"hf mfdes createfile --aid 123456 --fid 01 --amode plain --rrights free --wrights free --rwrights free --chrights key0 -> create file app=123456, file=01 and mentioned rights with defaults from `default` command",
"hf mfdes createfile -n 0 -t des -k 0000000000000000 -f none --aid 123456 --fid 01 --rawtype 00 --rawdata 00eeee000100 -> execute with default factory setup"
@ -4416,6 +4418,34 @@
],
"usage": "hf mfdes deletefile [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--fid <file id hex>] [--no-auth]"
},
"hf mfdes detect": {
"command": "hf mfdes detect",
"description": "detect key type and tries to find one from the list.",
"notes": [
"hf mfdes detect -> detect key 0 from picc level",
"hf mfdes detect -s d40 -> detect key 0 from picc level via secure channel d40",
"hf mfdes detect --dict mfdes_default_keys -> detect key 0 from picc level with help of the standard dictionary",
"hf mfdes detect --aid 123456 -n 2 --save -> detect key 2 from app 123456 and if succeed - save params to defaults (`default` command)"
],
"offline": false,
"options": [
"-h, --help this help",
"-a, --apdu show apdu requests and responses",
"-v, --verbose show technical data",
"-n, --keyno <keyno> key number",
"-t, --algo <des/2tdea/3tdea/aes> crypt algo: des, 2tdea, 3tdea, aes",
"-k, --key <key> key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)",
"-f, --kdf <none/an10922/gallagher> key derivation function (kdf): none, an10922, gallagher",
"-i, --kdfi <kdfi> kdf input (hex 1-31 bytes)",
"-m, --cmode <plain/mac/encrypt> communicaton mode: plain/mac/encrypt",
"-c, --ccset <native/niso/iso> communicaton command set: native/niso/iso",
"-s, --schann <d40/ev1/ev2> secure channel: d40/ev1/ev2",
"--aid <app id hex> application id (3 hex bytes, big endian)",
"--dict <file> file with keys dictionary",
"--save save found key and parameters to defaults"
],
"usage": "hf mfdes detect [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--dict <file>] [--save]"
},
"hf mfdes dump": {
"command": "hf mfdes dump",
"description": "for each application show fil list and then file content. key needs to be provided for authentication or flag --no-auth set (depend on cards settings).",
@ -4764,6 +4794,35 @@
],
"usage": "hf mfdes lsfiles [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--no-auth]"
},
"hf mfdes mad": {
"command": "hf mfdes mad",
"description": "reads and prints mifare application directory (mad).",
"notes": [
"mad consists of one file with issuer info (aid ffffff) and several files with aid in the special format `faaaav` (a - mad id, v - multiple aid over one mad id)",
"the mifare desfire card master key settings have to allow the mifare desfire command getapplicationids without authentication (from datasheet)",
"",
"hf mfdes mad -> shows mad data",
"hf mfdes mad -v -> shows mad parsed and raw data",
"hf mfdes mad -a e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows mad data with custom aid and key"
],
"offline": false,
"options": [
"-h, --help this help",
"-a, --apdu show apdu requests and responses",
"-v, --verbose show technical data",
"-n, --keyno <keyno> key number",
"-t, --algo <des/2tdea/3tdea/aes> crypt algo: des, 2tdea, 3tdea, aes",
"-k, --key <key> key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)",
"-f, --kdf <none/an10922/gallagher> key derivation function (kdf): none, an10922, gallagher",
"-i, --kdfi <kdfi> kdf input (hex 1-31 bytes)",
"-m, --cmode <plain/mac/encrypt> communicaton mode: plain/mac/encrypt",
"-c, --ccset <native/niso/iso> communicaton command set: native/niso/iso",
"-s, --schann <d40/ev1/ev2> secure channel: d40/ev1/ev2",
"--aid <app id hex> application id of issuer info file, (non-standard feature!) (3 hex bytes, big endian)",
"--auth authenticate to get info from getapplicationids command (non-standard feature!)"
],
"usage": "hf mfdes mad [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--auth]"
},
"hf mfdes read": {
"command": "hf mfdes read",
"description": "read data from file. key needs to be provided or flag --no-auth set (depend on file settings).",
@ -4811,7 +4870,8 @@
"hf mfdes selectapp --aid 123456 -> select application 123456",
"hf mfdes selectapp --mf -> select master file (picc level)",
"hf mfdes selectapp --dfname aid123456 -> select application aid123456 by df name",
"hf mfdes selectapp --isoid 1111 -> select application 1111 by iso id"
"hf mfdes selectapp --isoid 1111 -> select application 1111 by iso id",
"hf mfdes selectapp --isoid 1111 --fileisoid 2222 -> select application 1111 file 2222 by iso id"
],
"offline": false,
"options": [
@ -4828,10 +4888,11 @@
"-s, --schann <d40/ev1/ev2> secure channel: d40/ev1/ev2",
"--aid <app id hex> application id of application for some parameters (3 hex bytes, big endian)",
"--dfname <df name str> application df name (string, max 16 chars). selects application via iso select command",
"--mf select mf (master file) via iso channel",
"--isoid <isoid hex> application iso id (iso df id) (2 hex bytes, big endian)",
"--mf select mf (master file) via iso channel"
"--fileisoid <isoid hex> select file inside application by iso id (iso df id) (2 hex bytes, big endian)."
],
"usage": "hf mfdes selectapp [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--dfname <df name str>] [--isoid <isoid hex>] [--mf]"
"usage": "hf mfdes selectapp [-hav] [-n <keyno>] [-t <des/2tdea/3tdea/aes>] [-k <key>] [-f <none/an10922/gallagher>] [-i <kdfi>] [-m <plain/mac/encrypt>] [-c <native/niso/iso>] [-s <d40/ev1/ev2>] [--aid <app id hex>] [--dfname <df name str>] [--mf] [--isoid <isoid hex>] [--fileisoid <isoid hex>]"
},
"hf mfdes setconfig": {
"command": "hf mfdes setconfig",
@ -6187,7 +6248,7 @@
"-h, --help this help",
"--clk <dec> <32|64> clock (default 64)",
"--delay <dec> pause delay in milliseconds between uids simulation (default 1000ms)",
"-f, --file <hex> file with uids in hex format, one per line",
"-f, --file <hex> file with em tag ids, one id per line",
"--gap <dec> gap (0's) between id repeats (default 20)"
],
"usage": "lf em 410x brute [-h] [--clk <dec>] [--delay <dec>] -f <hex> [--gap <dec>]"
@ -6196,14 +6257,14 @@
"command": "lf em 410x clone",
"description": "writes em410x id to a t55x7 or q5/t5555 tag",
"notes": [
"lf em 410x clone --id 0f0368568b -> write id to t55x7 tag",
"lf em 410x clone --id 0f0368568b --q5 -> write id to q5/t5555 tag"
"lf em 410x clone --id 0f0368568b -> write t55x7 tag",
"lf em 410x clone --id 0f0368568b --q5 -> write q5/t5555 tag"
],
"offline": false,
"options": [
"-h, --help this help",
"--clk <dec> <16|32|40|64> clock (default 64)",
"--id <hex> id number (5 hex bytes)",
"--id <hex> em tag id number (5 hex bytes)",
"--q5 specify writing to q5/t5555 tag"
],
"usage": "lf em 410x clone [-h] [--clk <dec>] --id <hex> [--q5]"
@ -6212,12 +6273,12 @@
"command": "lf em 410x reader",
"description": "read em 410x tag",
"notes": [
"lf em 410x reader -> reader",
"lf em 410x reader",
"lf em 410x reader -@ -> continuous reader mode",
"lf em 410x reader --clk 32 -> reader using a clock of rf/32",
"lf em 410x reader --clk 32 -i -> reader using a clock of rf/32 and inverting data",
"lf em 410x reader -i -> reader while inverting data",
"lf em 410x reader --clk 64 -i --err 0 -> reader using a clock of rf/64 and inverting data and allowing 0 demod errors"
"lf em 410x reader --clk 32 -> using a clock of rf/32",
"lf em 410x reader --clk 32 -i -> using a clock of rf/32 and inverting data",
"lf em 410x reader -i -> inverting data",
"lf em 410x reader --clk 64 -i --err 0 -> using a clock of rf/64 and inverting data and allowing 0 demod errors"
],
"offline": false,
"options": [
@ -6245,14 +6306,14 @@
"options": [
"-h, --help this help",
"--clk <dec> <32|64> clock (default 64)",
"--id <hex> id number (5 hex bytes)",
"--id <hex> em tag id number (5 hex bytes)",
"--gap <dec> gap (0's) between id repeats (default 20)"
],
"usage": "lf em 410x sim [-h] [--clk <dec>] --id <hex> [--gap <dec>]"
},
"lf em 410x spoof": {
"command": "lf em 410x spoof",
"description": "watch 'nd spoof, activates reader waits until a em 410x tag gets presented then proxmark3 starts simulating the found uid",
"description": "watch 'nd spoof, activates reader waits until a em 410x tag gets presented then proxmark3 starts simulating the found em tag id",
"notes": [
"lf em 410x spoof"
],
@ -9889,8 +9950,8 @@
}
},
"metadata": {
"commands_extracted": 587,
"commands_extracted": 589,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2021-08-08T21:11:10"
"extracted_on": "2021-08-12T13:03:40"
}
}

10
doc/commands.md
View file

@ -507,11 +507,13 @@ Check column "offline" for their availability.
|`hf mfdes getuid `|N |`Get uid from card`
|`hf mfdes default `|N |`Set defaults for all the commands`
|`hf mfdes auth `|N |`MIFARE DesFire Authentication`
|`hf mfdes chk `|N |`[old]Check keys`
|`hf mfdes chk `|N |`Check keys`
|`hf mfdes detect `|N |`Detect key type and tries to find one from the list`
|`hf mfdes freemem `|N |`Get free memory size`
|`hf mfdes setconfig `|N |`Set card configuration`
|`hf mfdes formatpicc `|N |`Format PICC`
|`hf mfdes list `|Y |`List DESFire (ISO 14443A) history`
|`hf mfdes mad `|N |`Prints MAD records / files from the card`
|`hf mfdes lsapp `|N |`Show all applications with files list`
|`hf mfdes getaids `|N |`Get Application IDs list`
|`hf mfdes getappnames `|N |`Get Applications list`
@ -710,9 +712,9 @@ Check column "offline" for their availability.
|`lf em 410x reader `|N |`attempt to read and extract tag data`
|`lf em 410x sim `|N |`simulate EM410x tag`
|`lf em 410x brute `|N |`reader bruteforce attack by simulating EM410x tags`
|`lf em 410x watch `|N |`watches for EM410x 125/134 kHz tags (option 'h' for 134)`
|`lf em 410x spoof `|N |`watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)`
|`lf em 410x clone `|N |`write EM410x UID to T55x7 or Q5/T5555 tag`
|`lf em 410x watch `|N |`watches for EM410x 125/134 kHz tags`
|`lf em 410x spoof `|N |`watches for EM410x 125/134 kHz tags, and replays them`
|`lf em 410x clone `|N |`write EM410x Tag ID to T55x7 or Q5/T5555 tag`
### lf em 4x05