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

make style

Browse source
This commit is contained in:
Philippe Teuwen 2023-11-09 17:30:52 +01:00
commit ba8e90edfd
11 changed files with 113 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/cmdhficlass.c
View file

@ -1324,8 +1324,7 @@ static int CmdHFiClassESetBlk(const char *Cmd) {
static bool iclass_detect_new_pacs(uint8_t *d) { static bool iclass_detect_new_pacs(uint8_t *d) {
uint8_t n = 0; uint8_t n = 0;
while (n++ < (PICOPASS_BLOCK_SIZE / 2)) { while (n++ < (PICOPASS_BLOCK_SIZE / 2)) {
if (d[n] && if (d[n] && d[n + 1] == 0xA6) {
d[n + 1] == 0xA6) {
return true; return true;
} }
} }

1
client/src/pm3line_vocabulary.h
View file

@ -372,6 +372,7 @@ const static vocabulary_t vocabulary[] = {
{ 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 gchpwd" },
{ 0, "hf mf gdmcfg" }, { 0, "hf mf gdmcfg" },
{ 0, "hf mf gdmsetcfg" }, { 0, "hf mf gdmsetcfg" },
{ 0, "hf mf gdmsetblk" }, { 0, "hf mf gdmsetblk" },

34
doc/commands.json
View file

@ -4013,7 +4013,8 @@
"hf mf autopwn", "hf mf autopwn",
"hf mf autopwn -s 0 -a -k FFFFFFFFFFFF -> target MFC 1K card, Sector 0 with known key A 'FFFFFFFFFFFF'", "hf mf autopwn -s 0 -a -k FFFFFFFFFFFF -> target MFC 1K card, Sector 0 with known key A 'FFFFFFFFFFFF'",
"hf mf autopwn --1k -f mfc_default_keys -> target MFC 1K card, default dictionary", "hf mf autopwn --1k -f mfc_default_keys -> target MFC 1K card, default dictionary",
"hf mf autopwn --1k -s 0 -a -k FFFFFFFFFFFF -f mfc_default_keys -> combo of the two above samples" "hf mf autopwn --1k -s 0 -a -k FFFFFFFFFFFF -f mfc_default_keys -> combo of the two above samples",
"hf mf autopwn --1k -s 0 -a -k FFFFFFFFFFFF -k a0a1a2a3a4a5 -> multiple user supplied keys"
], ],
"offline": false, "offline": false,
"options": [ "options": [
@ -4037,7 +4038,7 @@
"--i2 AVX2", "--i2 AVX2",
"--i5 AVX512" "--i5 AVX512"
], ],
"usage": "hf mf autopwn [-hablv] [-k <hex>] [-s <dec>] [-f <fn>] [--slow] [--mini] [--1k] [--2k] [--4k] [--in] [--im] [--is] [--ia] [--i2] [--i5]" "usage": "hf mf autopwn [-hablv] [-k <hex>]... [-s <dec>] [-f <fn>] [--slow] [--mini] [--1k] [--2k] [--4k] [--in] [--im] [--is] [--ia] [--i2] [--i5]"
}, },
"hf mf cgetblk": { "hf mf cgetblk": {
"command": "hf mf cgetblk", "command": "hf mf cgetblk",
@ -4453,6 +4454,21 @@
], ],
"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 gchpwd": {
"command": "hf mf gchpwd",
"description": "Change access password for Gen4 GTU card. WARNING! If you dont KNOW the password - you CAN'T access it!!!",
"notes": [
"hf mf gchpwd --pwd 00000000 --newpwd 01020304"
],
"offline": false,
"options": [
"-h, --help This help",
"-p, --pwd <hex> password 4 bytes",
"-n, --newpwd <hex> new password 4 bytes",
"-v, --verbose verbose output"
],
"usage": "hf mf gchpwd [-hv] [-p <hex>] [-n <hex>]"
},
"hf mf gdmcfg": { "hf mf gdmcfg": {
"command": "hf mf gdmcfg", "command": "hf mf gdmcfg",
"description": "Get configuration data from magic gen4 GDM card.", "description": "Get configuration data from magic gen4 GDM card.",
@ -7686,13 +7702,15 @@
"command": "hw status", "command": "hw status",
"description": "Show runtime status information about the connected Proxmark3", "description": "Show runtime status information about the connected Proxmark3",
"notes": [ "notes": [
"hw status" "hw status",
"hw status --ms 1000 -> Test connection speed with 1000ms timeout"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help This help" "-h, --help This help",
"-m, --ms <ms> speed test timeout in micro seconds"
], ],
"usage": "hw status [-h]" "usage": "hw status [-h] [-m <ms>]"
}, },
"hw tearoff": { "hw tearoff": {
"command": "hw tearoff", "command": "hw tearoff",
@ -8955,7 +8973,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 \u041e\u0458" "-m, --htm Card type Hitag \u03bc"
], ],
"usage": "lf hitag eload [-h12sm] -f <fn>" "usage": "lf hitag eload [-h12sm] -f <fn>"
}, },
@ -12031,8 +12049,8 @@
} }
}, },
"metadata": { "metadata": {
"commands_extracted": 697, "commands_extracted": 698,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-11-05T22:22:55" "extracted_on": "2023-11-09T16:29:08"
} }
} }

1
doc/commands.md
View file

@ -535,6 +535,7 @@ 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 gchpwd `|N |`Change card access password. Warning!`
|`hf mf gdmcfg `|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 gdmsetcfg `|N |`Write config block to card`
|`hf mf gdmsetblk `|N |`Write block to card` |`hf mf gdmsetblk `|N |`Write block to card`

3
include/mifare.h
View file

@ -73,8 +73,7 @@ typedef struct {
} iso14a_mf_extdump_t; } iso14a_mf_extdump_t;
typedef struct { typedef struct {
union union {
{
iso14a_card_select_t mfc; iso14a_card_select_t mfc;
iso14a_card_select_ev1_t ev1; iso14a_card_select_ev1_t ev1;
} card; } card;