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

make style

Browse source
This commit is contained in:
Philippe Teuwen 2022-01-09 14:10:26 +01:00
commit 5a4584358c
12 changed files with 88 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/rl_vocabulory.h
View file

@ -1,17 +1,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. // Copyright (C) 2021 <iceman>
// //
// This program is free software: you can redistribute it and/or modify // This code is licensed to you under the terms of the GNU GPL, version 2 or,
// it under the terms of the GNU General Public License as published by // at your option, any later version. See the LICENSE.txt file for the text of
// the Free Software Foundation, either version 3 of the License, or // the license.
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// See LICENSE.txt for the text of the license.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// readline auto complete utilities // readline auto complete utilities
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

50
doc/commands.json
View file

@ -2322,30 +2322,30 @@
}, },
"hf gallagher clone": { "hf gallagher clone": {
"command": "hf gallagher clone", "command": "hf gallagher clone",
"description": "clone gallagher credentials to a writable desfire card", "description": "clone gallagher credentials to a writable desfire card specify site key is required if using non-default key key, lengths for the different crypto: des 8 bytes 2tdea or aes 16 bytes 3tdea 24 bytes aid id, default finds lowest available in range 0x2?81f4, where 0 <= ? <= 0xb.",
"notes": [ "notes": [
"hf gallagher clone --rc 1 --fc 22 --cn 3333 --il 4 --sitekey 00112233445566778899aabbccddeeff" "hf gallagher clone --rc 1 --fc 22 --cn 3333 --il 4 --sitekey 00112233445566778899aabbccddeeff"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"-n, --keynum <decimal> key number [default=0]", "-n, --keynum <dec> key number [default = 0]",
"-t, --algo <des/2tdea/3tdea/aes> crypt algo: des, 2tdea, 3tdea, aes", "-t, --algo <des|2tdea|3tdea|aes> crypt algo: des, 2tdea, 3tdea, aes",
"-k, --key <hex> key for authentication to the picc (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", "-k, --key <hex> key for authentication to the picc",
"--rc <decimal> region code. 4 bits max", "--rc <dec> region code. 4 bits max",
"--fc <decimal> facility code. 2 bytes max", "--fc <dec> facility code. 2 bytes max",
"--cn <decimal> card number. 3 bytes max", "--cn <dec> card number. 3 bytes max",
"--il <decimal> issue level. 4 bits max", "--il <dec> issue level. 4 bits max",
"--aid <hex> application id to write (3 bytes) [default finds lowest available in range 0x2?81f4, where 0 <= ? <= 0xb]", "--aid <hex> application id to write (3 bytes)",
"--sitekey <hex> mifare site key to compute diversified keys (16 bytes, required if using non-default key)", "--sitekey <hex> site key to compute diversified keys (16 bytes)",
"--apdu show apdu requests and responses", "--apdu show apdu requests and responses",
"-v, --verbose verbose mode" "-v, --verbose verbose mode"
], ],
"usage": "hf gallagher clone [-hv] [-n <decimal>] [-t <des/2tdea/3tdea/aes>] [-k <hex>] --rc <decimal> --fc <decimal> --cn <decimal> --il <decimal> [--aid <hex>] [--sitekey <hex>] [--apdu]" "usage": "hf gallagher clone [-hv] [-n <dec>] [-t <des|2tdea|3tdea|aes>] [-k <hex>] --rc <dec> --fc <dec> --cn <dec> --il <dec> [--aid <hex>] [--sitekey <hex>] [--apdu]"
}, },
"hf gallagher delete": { "hf gallagher delete": {
"command": "hf gallagher delete", "command": "hf gallagher delete",
"description": "delete gallagher application from a desfire card", "description": "delete gallagher application from a desfire card specify site key is required if using non-default key",
"notes": [ "notes": [
"hf gallagher delete --aid 2081f4 --sitekey 00112233445566778899aabbccddeeff" "hf gallagher delete --aid 2081f4 --sitekey 00112233445566778899aabbccddeeff"
], ],
@ -2353,7 +2353,7 @@
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"--aid <hex> application id to delete (3 bytes)", "--aid <hex> application id to delete (3 bytes)",
"--sitekey <hex> mifare site key to compute diversified keys (16 bytes, required if using non-default key)", "--sitekey <hex> site key to compute diversified keys (16 bytes)",
"--apdu show apdu requests and responses", "--apdu show apdu requests and responses",
"-v, --verbose verbose mode" "-v, --verbose verbose mode"
], ],
@ -2361,7 +2361,7 @@
}, },
"hf gallagher diversifykey": { "hf gallagher diversifykey": {
"command": "hf gallagher diversifykey", "command": "hf gallagher diversifykey",
"description": "diversify gallagher key", "description": "diversify gallagher key specify site key is required if using non-default key",
"notes": [ "notes": [
"hf gallagher diversify --uid 11223344556677 --aid 2081f4" "hf gallagher diversify --uid 11223344556677 --aid 2081f4"
], ],
@ -2369,25 +2369,25 @@
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"--aid <hex> application id for diversification (3 bytes)", "--aid <hex> application id for diversification (3 bytes)",
"--keynum <decimal> key number [default=0]", "--keynum <dec> key number [default = 0]",
"--uid <hex> card uid to delete (4 or 7 bytes)", "--uid <hex> card uid to delete (4 or 7 bytes)",
"--sitekey <hex> mifare site key to compute diversified keys (16 bytes, required if using non-default key)", "--sitekey <hex> site key to compute diversified keys (16 bytes)",
"--apdu show apdu requests and responses" "--apdu show apdu requests and responses"
], ],
"usage": "hf gallagher diversify [-h] --aid <hex> [--keynum <decimal>] [--uid <hex>] [--sitekey <hex>] [--apdu]" "usage": "hf gallagher diversify [-h] --aid <hex> [--keynum <dec>] [--uid <hex>] [--sitekey <hex>] [--apdu]"
}, },
"hf gallagher help": { "hf gallagher help": {
"command": "hf gallagher help", "command": "hf gallagher help",
"description": "help this help diversifykey diversify gallagher key --------------------------------------------------------------------------------------- hf gallagher reader available offline: no read a gallagher desfire tag", "description": "help this help diversifykey diversify gallagher key --------------------------------------------------------------------------------------- hf gallagher reader available offline: no read a gallagher desfire tag from the card application directory, cad specify site key is required if using non-default key",
"notes": [ "notes": [
"hf gallagher reader --aid 2081f4 --sitekey 00112233445566778899aabbccddeeff -> act as a reader that skips reading the card application directory and uses a non-default site key", "hf gallagher reader -@ -> continuous reader mode",
"hf gallagher reader -@ -> continuous reader mode" "hf gallagher reader --aid 2081f4 --sitekey 00112233445566778899aabbccddeeff -> skip cad"
], ],
"offline": true, "offline": true,
"options": [ "options": [
"-h, --help this help", "-h, --help this help",
"--aid <hex> application id to read (3 bytes). if specified, then the card application directory is not used", "--aid <hex> application id to read (3 bytes). if specified, the cad is not used",
"--sitekey <hex> mifare site key to compute diversified keys (16 bytes, required if using non-default key)", "--sitekey <hex> site key to compute diversified keys (16 bytes)",
"-@, --continuous continuous reader mode", "-@, --continuous continuous reader mode",
"--apdu show apdu requests and responses", "--apdu show apdu requests and responses",
"-v, --verbose verbose mode" "-v, --verbose verbose mode"
@ -7194,7 +7194,7 @@
}, },
"lf gproxii clone": { "lf gproxii clone": {
"command": "lf gproxii clone", "command": "lf gproxii clone",
"description": "clone a guardall tag to a t55x7, q5/t5555 or em4305/4469 tag. the facility-code is 8-bit and the card number is 16-bit. larger values are truncated. currently work only on 26bit", "description": "clone a guardall tag to a t55x7, q5/t5555 or em4305/4469 tag. the facility-code is 8-bit and the card number is 20-bit. larger values are truncated. currently work only on 26 | 36 bit format",
"notes": [ "notes": [
"lf gproxii clone --fmt 26 --fc 123 --cn 1337", "lf gproxii clone --fmt 26 --fc 123 --cn 1337",
"lf gproxii clone --q5 --fmt 26 --fc 123 --cn 1337 -> encode for q5/t5555 tag", "lf gproxii clone --q5 --fmt 26 --fc 123 --cn 1337 -> encode for q5/t5555 tag",
@ -7240,7 +7240,7 @@
}, },
"lf gproxii sim": { "lf gproxii sim": {
"command": "lf gproxii sim", "command": "lf gproxii sim",
"description": "enables simulation of guardall card with specified card number. simulation runs until the button is pressed or another usb command is issued. the facility-code is 8-bit and the card number is 16-bit. larger values are truncated. currently work only on 26bit", "description": "enables simulation of guardall card with specified card number. simulation runs until the button is pressed or another usb command is issued. the facility-code is 8-bit and the card number is 16-bit. larger values are truncated. currently work only on 26 | 36 bit format",
"notes": [ "notes": [
"lf gproxii sim --fmt 26 --fc 123 --cn 1337" "lf gproxii sim --fmt 26 --fc 123 --cn 1337"
], ],
@ -10237,6 +10237,6 @@
"metadata": { "metadata": {
"commands_extracted": 601, "commands_extracted": 601,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2022-01-06T19:05:01" "extracted_on": "2022-01-09T13:10:14"
} }
} }