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

make style

Browse source
This commit is contained in:
merlokk 2023-11-06 00:29:28 +02:00
commit 910c4d8c92
9 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.vscode/extensions.json vendored
View file

@ -3,7 +3,6 @@
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"ms-vscode.cpptools", "ms-vscode.cpptools",
"austin.code-gnu-global",
"marus25.cortex-debug", "marus25.cortex-debug",
"augustocdias.tasks-shell-input" "augustocdias.tasks-shell-input"
] ]

1
client/src/pm3line_vocabulary.h
View file

@ -366,6 +366,7 @@ const static vocabulary_t vocabulary[] = {
{ 0, "hf mf gen3uid" }, { 0, "hf mf gen3uid" },
{ 0, "hf mf gen3blk" }, { 0, "hf mf gen3blk" },
{ 0, "hf mf gen3freeze" }, { 0, "hf mf gen3freeze" },
{ 0, "hf mf ginfo" },
{ 0, "hf mf ggetblk" }, { 0, "hf mf ggetblk" },
{ 0, "hf mf gload" }, { 0, "hf mf gload" },
{ 0, "hf mf gsave" }, { 0, "hf mf gsave" },

28
doc/commands.json
View file

@ -279,6 +279,7 @@
"command": "data bmap", "command": "data bmap",
"description": "Breaks down a hex value to binary according a template data bmap -d 16 -m 4,4 This will give two rows each with four bits", "description": "Breaks down a hex value to binary according a template data bmap -d 16 -m 4,4 This will give two rows each with four bits",
"notes": [ "notes": [
"data bmap -d 3B",
"data bmap -d 3B -m 2,5,1" "data bmap -d 3B -m 2,5,1"
], ],
"offline": true, "offline": true,
@ -3026,10 +3027,10 @@
}, },
"hf iclass configcard": { "hf iclass configcard": {
"command": "hf iclass configcard", "command": "hf iclass configcard",
"description": "Manage reader configuration card via Cardhelper, The generated config card will be uploaded to device emulator memory. You can start simulating `hf iclass sim -t 3` or use the emul commands", "description": "Manage reader configuration card via Cardhelper or internal database, The generated config card will be uploaded to device emulator memory. You can start simulating `hf iclass sim -t 3` or use the emul commands",
"notes": [ "notes": [
"hf iclass configcard -l -> download config card settings", "hf iclass configcard -l -> download config card settings from cardhelper",
"hf iclass configcard -p -> print all config cards", "hf iclass configcard -p -> print all config cards in the database",
"hf iclass configcard --ci 1 -> view config card setting in slot 1", "hf iclass configcard --ci 1 -> view config card setting in slot 1",
"hf iclass configcard -g --ci 0 -> generate config file from slot 0" "hf iclass configcard -g --ci 0 -> generate config file from slot 0"
], ],
@ -4553,6 +4554,21 @@
], ],
"usage": "hf mf ggetblk [-hv] -b <dec> [-p <hex>]" "usage": "hf mf ggetblk [-hv] -b <dec> [-p <hex>]"
}, },
"hf mf ginfo": {
"command": "hf mf ginfo",
"description": "Read info about magic gen4 GTU card.",
"notes": [
"hf mf ginfo -> get info with default password 00000000",
"hf mf ginfo --pwd 01020304 -> get info with password"
],
"offline": false,
"options": [
"-h, --help This help",
"-v, --verbose verbose output",
"-p, --pwd <hex> password 4bytes"
],
"usage": "hf mf ginfo [-hv] [-p <hex>]"
},
"hf mf gload": { "hf mf gload": {
"command": "hf mf gload", "command": "hf mf gload",
"description": "Load magic gen4 gtu card with data from (bin/eml/json) dump file or from emulator memory.", "description": "Load magic gen4 gtu card with data from (bin/eml/json) dump file or from emulator memory.",
@ -8939,7 +8955,7 @@
"-1, --ht1 Card type Hitag 1", "-1, --ht1 Card type Hitag 1",
"-2, --ht2 Card type Hitag 2", "-2, --ht2 Card type Hitag 2",
"-s, --hts Card type Hitag S", "-s, --hts Card type Hitag S",
"-m, --htm Card type Hitag \u03bc" "-m, --htm Card type Hitag \u041e\u0458"
], ],
"usage": "lf hitag eload [-h12sm] -f <fn>" "usage": "lf hitag eload [-h12sm] -f <fn>"
}, },
@ -12015,8 +12031,8 @@
} }
}, },
"metadata": { "metadata": {
"commands_extracted": 696, "commands_extracted": 697,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-10-30T12:11:34" "extracted_on": "2023-11-05T22:22:55"
} }
} }

1
doc/commands.md
View file

@ -529,6 +529,7 @@ Check column "offline" for their availability.
|`hf mf gen3uid `|N |`Set UID without changing manufacturer block` |`hf mf gen3uid `|N |`Set UID without changing manufacturer block`
|`hf mf gen3blk `|N |`Overwrite manufacturer block` |`hf mf gen3blk `|N |`Overwrite manufacturer block`
|`hf mf gen3freeze `|N |`Perma lock UID changes. irreversible` |`hf mf gen3freeze `|N |`Perma lock UID changes. irreversible`
|`hf mf ginfo `|N |`Info about configuration of the card`
|`hf mf ggetblk `|N |`Read block from card` |`hf mf ggetblk `|N |`Read block from card`
|`hf mf gload `|N |`Load dump to card` |`hf mf gload `|N |`Load dump to card`
|`hf mf gsave `|N |`Save dump from card into file or emulator` |`hf mf gsave `|N |`Save dump from card into file or emulator`