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

make style

Browse source
This commit is contained in:
merlokk 2021-08-09 00:12:01 +03:00
commit 28dc6c717b
6 changed files with 54 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/mifare/desfiretest.c
View file

@ -187,7 +187,8 @@ static bool TestAn10922KDF3TDEA(void) {
MifareKdfAn10922(&dctx, DCOMainKey, kdfInput, sizeof(kdfInput)); MifareKdfAn10922(&dctx, DCOMainKey, kdfInput, sizeof(kdfInput));
uint8_t dkey[] = {0x2F, 0x0D, 0xD0, 0x36, 0x75, 0xD3, 0xFB, 0x9A, 0x57, 0x05, 0xAB, 0x0B, 0xDA, 0x91, 0xCA, 0x0B, uint8_t dkey[] = {0x2F, 0x0D, 0xD0, 0x36, 0x75, 0xD3, 0xFB, 0x9A, 0x57, 0x05, 0xAB, 0x0B, 0xDA, 0x91, 0xCA, 0x0B,
0x55, 0xB8, 0xE0, 0x7F, 0xCD, 0xBF, 0x10, 0xEC}; 0x55, 0xB8, 0xE0, 0x7F, 0xCD, 0xBF, 0x10, 0xEC
};
res = res && (memcmp(dctx.key, dkey, sizeof(dkey)) == 0); res = res && (memcmp(dctx.key, dkey, sizeof(dkey)) == 0);
if (res) if (res)

32
doc/commands.json
View file

@ -973,7 +973,7 @@
}, },
"help": { "help": {
"command": "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 /home/iceman/.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_20210808.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
"notes": [ "notes": [
"auto" "auto"
], ],
@ -4873,7 +4873,7 @@
}, },
"hf mfdes test": { "hf mfdes test": {
"command": "hf mfdes test", "command": "hf mfdes test",
"description": "[=] ------ desfire tests ------ [!] no space for crc. pos: 1 [=] crc16............. passed [!] no space for crc. pos: 2 [=] crc32............. passed [=] cmac 3tdea........ passed [=] cmac 2tdea........ passed [=] cmac des.......... passed [=] ev2 session keys.. passed [=] ev2 iv calc....... passed [=] ev2 mac calc...... passed [=] --------------------------- [+] tests [ ok ] ======================================================================================= hf seos { seos rfids... } --------------------------------------------------------------------------------------- hf seos help available offline: yes help this help list list seos history --------------------------------------------------------------------------------------- hf seos info available offline: no get info from seos tags", "description": "[=] ------ desfire tests ------ [!] no space for crc. pos: 1 [=] crc16............. passed [!] no space for crc. pos: 2 [=] crc32............. passed [=] cmac subkeys...... passed [=] an10922 aes....... passed [=] an10922 2tdea..... passed [=] an10922 3tdea..... passed [=] cmac 3tdea........ passed [=] cmac 2tdea........ passed [=] cmac des.......... passed [=] ev2 session keys.. passed [=] ev2 iv calc....... passed [=] ev2 mac calc...... passed [=] --------------------------- [+] tests [ ok ] ======================================================================================= hf seos { seos rfids... } --------------------------------------------------------------------------------------- hf seos help available offline: yes help this help list list seos history --------------------------------------------------------------------------------------- hf seos info available offline: no get info from seos tags",
"notes": [ "notes": [
"hf seos info" "hf seos info"
], ],
@ -5737,8 +5737,8 @@
"command": "hw connect", "command": "hw connect",
"description": "connects to a proxmark3 device via specified serial port. baudrate here is only for physical uart or uart-bt, not for usb-cdc or blue shark add-on", "description": "connects to a proxmark3 device via specified serial port. baudrate here is only for physical uart or uart-bt, not for usb-cdc or blue shark add-on",
"notes": [ "notes": [
"hw connect -p /dev/ttyacm0", "hw connect -p com3",
"hw connect -p /dev/ttyacm0 -b 115200" "hw connect -p com3 -b 115200"
], ],
"offline": true, "offline": true,
"options": [ "options": [
@ -6187,7 +6187,7 @@
"-h, --help this help", "-h, --help this help",
"--clk <dec> <32|64> clock (default 64)", "--clk <dec> <32|64> clock (default 64)",
"--delay <dec> pause delay in milliseconds between uids simulation (default 1000ms)", "--delay <dec> pause delay in milliseconds between uids simulation (default 1000ms)",
"-f, --file <hex> file with em tag ids, one id per line", "-f, --file <hex> file with uids in hex format, one per line",
"--gap <dec> gap (0's) between id repeats (default 20)" "--gap <dec> gap (0's) between id repeats (default 20)"
], ],
"usage": "lf em 410x brute [-h] [--clk <dec>] [--delay <dec>] -f <hex> [--gap <dec>]" "usage": "lf em 410x brute [-h] [--clk <dec>] [--delay <dec>] -f <hex> [--gap <dec>]"
@ -6196,14 +6196,14 @@
"command": "lf em 410x clone", "command": "lf em 410x clone",
"description": "writes em410x id to a t55x7 or q5/t5555 tag", "description": "writes em410x id to a t55x7 or q5/t5555 tag",
"notes": [ "notes": [
"lf em 410x clone --id 0f0368568b -> write t55x7 tag", "lf em 410x clone --id 0f0368568b -> write id to t55x7 tag",
"lf em 410x clone --id 0f0368568b --q5 -> write q5/t5555 tag" "lf em 410x clone --id 0f0368568b --q5 -> write id to q5/t5555 tag"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"--clk <dec> <16|32|40|64> clock (default 64)", "--clk <dec> <16|32|40|64> clock (default 64)",
"--id <hex> em tag id number (5 hex bytes)", "--id <hex> id number (5 hex bytes)",
"--q5 specify writing to q5/t5555 tag" "--q5 specify writing to q5/t5555 tag"
], ],
"usage": "lf em 410x clone [-h] [--clk <dec>] --id <hex> [--q5]" "usage": "lf em 410x clone [-h] [--clk <dec>] --id <hex> [--q5]"
@ -6212,12 +6212,12 @@
"command": "lf em 410x reader", "command": "lf em 410x reader",
"description": "read em 410x tag", "description": "read em 410x tag",
"notes": [ "notes": [
"lf em 410x reader", "lf em 410x reader -> reader",
"lf em 410x reader -@ -> continuous reader mode", "lf em 410x reader -@ -> continuous reader mode",
"lf em 410x reader --clk 32 -> using a clock of rf/32", "lf em 410x reader --clk 32 -> reader 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 --clk 32 -i -> reader using a clock of rf/32 and inverting data",
"lf em 410x reader -i -> inverting data", "lf em 410x reader -i -> reader while 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" "lf em 410x reader --clk 64 -i --err 0 -> reader using a clock of rf/64 and inverting data and allowing 0 demod errors"
], ],
"offline": false, "offline": false,
"options": [ "options": [
@ -6245,14 +6245,14 @@
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"--clk <dec> <32|64> clock (default 64)", "--clk <dec> <32|64> clock (default 64)",
"--id <hex> em tag id number (5 hex bytes)", "--id <hex> id number (5 hex bytes)",
"--gap <dec> gap (0's) between id repeats (default 20)" "--gap <dec> gap (0's) between id repeats (default 20)"
], ],
"usage": "lf em 410x sim [-h] [--clk <dec>] --id <hex> [--gap <dec>]" "usage": "lf em 410x sim [-h] [--clk <dec>] --id <hex> [--gap <dec>]"
}, },
"lf em 410x spoof": { "lf em 410x spoof": {
"command": "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 em tag id", "description": "watch 'nd spoof, activates reader waits until a em 410x tag gets presented then proxmark3 starts simulating the found uid",
"notes": [ "notes": [
"lf em 410x spoof" "lf em 410x spoof"
], ],
@ -9891,6 +9891,6 @@
"metadata": { "metadata": {
"commands_extracted": 587, "commands_extracted": 587,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2021-08-08T13:35:19" "extracted_on": "2021-08-08T21:11:10"
} }
} }

6
doc/commands.md
View file

@ -710,9 +710,9 @@ Check column "offline" for their availability.
|`lf em 410x reader `|N |`attempt to read and extract tag data` |`lf em 410x reader `|N |`attempt to read and extract tag data`
|`lf em 410x sim `|N |`simulate EM410x tag` |`lf em 410x sim `|N |`simulate EM410x tag`
|`lf em 410x brute `|N |`reader bruteforce attack by simulating EM410x tags` |`lf em 410x brute `|N |`reader bruteforce attack by simulating EM410x tags`
|`lf em 410x watch `|N |`watches for EM410x 125/134 kHz 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` |`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 Tag ID to T55x7 or Q5/T5555 tag` |`lf em 410x clone `|N |`write EM410x UID to T55x7 or Q5/T5555 tag`
### lf em 4x05 ### lf em 4x05