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

style

Browse source
This commit is contained in:
iceman1001 2023-07-23 12:53:04 +02:00
commit a761c9765a
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/src/pm3line_vocabulory.h
View file

@ -288,6 +288,7 @@ const static vocabulory_t vocabulory[] = {
{ 1, "hf iclass managekeys" },
{ 1, "hf iclass permutekey" },
{ 1, "hf iclass view" },
{ 0, "hf iclass sam" },
{ 1, "hf legic help" },
{ 0, "hf legic dump" },
{ 0, "hf legic info" },

4
common/cardhelper.c
View file

@ -88,9 +88,9 @@ bool IsHIDSamPresent(bool verbose) {
uint8_t T0 = card.atr[1];
uint8_t K = T0 & 0x0F;
if (K > 4 && verbose) {
if (byte_strstr(card.atr, card.atr_len, (const uint8_t*)"Grace", 5)> -1) {
if (byte_strstr(card.atr, card.atr_len, (const uint8_t *)"Grace", 5) > -1) {
PrintAndLogEx(SUCCESS, "SAM (Grace) detected");
} else if (byte_strstr(card.atr, card.atr_len, (const uint8_t*)"Hopper", 6) > -1) {
} else if (byte_strstr(card.atr, card.atr_len, (const uint8_t *)"Hopper", 6) > -1) {
PrintAndLogEx(SUCCESS, "SAM (Hopper) detected");
}
}

18
doc/commands.json
View file

@ -3303,6 +3303,20 @@
],
"usage": "hf iclass restore [-hv] -f <fn> [-k <hex>] [--ki <dec>] --first <dec> --last <dec> [--credit] [--elite] [--raw] [--shallow]"
},
"hf iclass sam": {
"command": "hf iclass sam",
"description": "Manage via SAM",
"notes": [
"hf iclass sam"
],
"offline": false,
"options": [
"-h, --help This help",
"-d, --data <hex> data",
"-v, --verbose verbose output"
],
"usage": "hf iclass sam [-hv] [-d <hex>]"
},
"hf iclass sim": {
"command": "hf iclass sim",
"description": "Simulate a iCLASS legacy/standard tag",
@ -11754,8 +11768,8 @@
}
},
"metadata": {
"commands_extracted": 681,
"commands_extracted": 682,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-07-23T09:14:42"
"extracted_on": "2023-07-23T09:59:37"
}
}

1
doc/commands.md
View file

@ -427,6 +427,7 @@ Check column "offline" for their availability.
|`hf iclass managekeys `|Y |`Manage keys to use with iclass commands`
|`hf iclass permutekey `|Y |`Permute function from 'heart of darkness' paper`
|`hf iclass view `|Y |`Display content from tag dump file`
|`hf iclass sam `|N |`SAM tests`
### hf legic