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

make style

Browse source
This commit is contained in:
iceman1001 2022-02-18 22:31:34 +01:00
commit 1f470483ec
4 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/cmdhfmf.c
View file

@ -6208,10 +6208,10 @@ static bool mfc_value(const uint8_t *d, uint32_t *val) {
uint32_t b = MemLeToUint4byte(d + 8); uint32_t b = MemLeToUint4byte(d + 8);
int val_checks = ( int val_checks = (
(a == b) && (a == ~a_inv) && (a == b) && (a == ~a_inv) &&
(d[12] == (~d[13] & 0xFF)) && (d[12] == (~d[13] & 0xFF)) &&
(d[14] == (~d[15] & 0xFF)) (d[14] == (~d[15] & 0xFF))
); );
if (val) { if (val) {
*val = a; *val = a;
@ -6241,7 +6241,7 @@ static int CmdHF14AMfValue(const char *Cmd) {
uint32_t value = 0; uint32_t value = 0;
if (mfc_value(data, &value)) { if (mfc_value(data, &value)) {
PrintAndLogEx(SUCCESS, "Dec... " _YELLOW_("%" PRIu32 ), value); PrintAndLogEx(SUCCESS, "Dec... " _YELLOW_("%" PRIu32), value);
PrintAndLogEx(SUCCESS, "Hex... " _YELLOW_("0x%" PRIX32), value); PrintAndLogEx(SUCCESS, "Hex... " _YELLOW_("0x%" PRIX32), value);
} else { } else {
PrintAndLogEx(FAILED, "No value block detected"); PrintAndLogEx(FAILED, "No value block detected");

1
client/src/pm3line_vocabulory.h
View file

@ -305,6 +305,7 @@ const static vocabulory_t vocabulory[] = {
{ 0, "hf mf rdsc" }, { 0, "hf mf rdsc" },
{ 0, "hf mf restore" }, { 0, "hf mf restore" },
{ 0, "hf mf setmod" }, { 0, "hf mf setmod" },
{ 1, "hf mf value" },
{ 1, "hf mf view" }, { 1, "hf mf view" },
{ 0, "hf mf wipe" }, { 0, "hf mf wipe" },
{ 0, "hf mf wrbl" }, { 0, "hf mf wrbl" },

23
doc/commands.json
View file

@ -4098,7 +4098,7 @@
}, },
"hf mf help": { "hf mf help": {
"command": "hf mf help", "command": "hf mf help",
"description": "help this help list list mifare history hardnested nested attack for hardened mifare classic cards decrypt [nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace acl decode and print mifare classic access rights bytes view display content from tag dump file", "description": "help this help list list mifare history hardnested nested attack for hardened mifare classic cards decrypt [nt] [ar_enc] [at_enc] [data] - to decrypt sniff or trace acl decode and print mifare classic access rights bytes value decode a value block view display content from tag dump file",
"notes": [], "notes": [],
"offline": true, "offline": true,
"options": [], "options": [],
@ -4358,6 +4358,19 @@
], ],
"usage": "hf mf supercard [-hr]" "usage": "hf mf supercard [-hr]"
}, },
"hf mf value": {
"command": "hf mf value",
"description": "decode of a mifare value block",
"notes": [
"hf mf value -d 87d612007829edff87d6120011ee11ee"
],
"offline": true,
"options": [
"-h, --help this help",
"-d, --data <hex> 16 hex bytes"
],
"usage": "hf mf value [-h] -d <hex>"
},
"hf mf view": { "hf mf view": {
"command": "hf mf view", "command": "hf mf view",
"description": "print a mifare classic dump file (bin/eml/json)", "description": "print a mifare classic dump file (bin/eml/json)",
@ -7162,10 +7175,10 @@
"--4205 target chip type em 4205", "--4205 target chip type em 4205",
"--4305 target chip type em 4305 (default)", "--4305 target chip type em 4305 (default)",
"--4369 target chip type em 4369", "--4369 target chip type em 4369",
"--4369 target chip type em 4469", "--4469 target chip type em 4469",
"-p, --pwd <hex> optional - password, 4 bytes hex" "-p, --pwd <hex> optional - password, 4 bytes hex"
], ],
"usage": "lf em 4x05 wipe [-h] [--4205] [--4305] [--4369] [--4369] [-p <hex>]" "usage": "lf em 4x05 wipe [-h] [--4205] [--4305] [--4369] [--4469] [-p <hex>]"
}, },
"lf em 4x05 write": { "lf em 4x05 write": {
"command": "lf em 4x05 write", "command": "lf em 4x05 write",
@ -10887,8 +10900,8 @@
} }
}, },
"metadata": { "metadata": {
"commands_extracted": 687, "commands_extracted": 688,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2022-02-17T00:41:11" "extracted_on": "2022-02-18T21:30:00"
} }
} }

1
doc/commands.md
View file

@ -460,6 +460,7 @@ Check column "offline" for their availability.
|`hf mf rdsc `|N |`Read MIFARE Classic sector` |`hf mf rdsc `|N |`Read MIFARE Classic sector`
|`hf mf restore `|N |`Restore MIFARE Classic binary file to BLANK tag` |`hf mf restore `|N |`Restore MIFARE Classic binary file to BLANK tag`
|`hf mf setmod `|N |`Set MIFARE Classic EV1 load modulation strength` |`hf mf setmod `|N |`Set MIFARE Classic EV1 load modulation strength`
|`hf mf value `|Y |`Decode a value block`
|`hf mf view `|Y |`Display content from tag dump file` |`hf mf view `|Y |`Display content from tag dump file`
|`hf mf wipe `|N |`Wipe card to zeros and default keys/acc` |`hf mf wipe `|N |`Wipe card to zeros and default keys/acc`
|`hf mf wrbl `|N |`Write MIFARE Classic block` |`hf mf wrbl `|N |`Write MIFARE Classic block`