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

style

Browse source
This commit is contained in:
iceman1001 2023-08-02 22:41:35 +02:00
commit 5b58e438b1
4 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/cmddata.c
View file

@ -3439,10 +3439,10 @@ static int CmdAtrLookup(const char *Cmd) {
PrintAndLogEx(INFO, "ISO7816-3 ATR... " _YELLOW_("%s"), data); PrintAndLogEx(INFO, "ISO7816-3 ATR... " _YELLOW_("%s"), data);
PrintAndLogEx(INFO, "Fingerprint..."); PrintAndLogEx(INFO, "Fingerprint...");
char *copy = str_dup(getAtrInfo((char*)data)); char *copy = str_dup(getAtrInfo((char *)data));
char * token = strtok(copy, "\n"); char *token = strtok(copy, "\n");
while ( token != NULL ) { while (token != NULL) {
PrintAndLogEx(INFO, " %s", token); PrintAndLogEx(INFO, " %s", token);
token = strtok(NULL, "\n"); token = strtok(NULL, "\n");
} }

1
client/src/pm3line_vocabulory.h
View file

@ -102,6 +102,7 @@ const static vocabulory_t vocabulory[] = {
{ 1, "data convertbitstream" }, { 1, "data convertbitstream" },
{ 1, "data getbitstream" }, { 1, "data getbitstream" },
{ 1, "data asn1" }, { 1, "data asn1" },
{ 1, "data atr" },
{ 1, "data bin2hex" }, { 1, "data bin2hex" },
{ 0, "data bitsamples" }, { 0, "data bitsamples" },
{ 1, "data clear" }, { 1, "data clear" },

42
doc/commands.json
View file

@ -140,15 +140,17 @@
"command": "analyse units", "command": "analyse units",
"description": "experiments of unit conversions found in HF. ETU (1/13.56mhz), US or SSP_CLK (1/3.39MHz)", "description": "experiments of unit conversions found in HF. ETU (1/13.56mhz), US or SSP_CLK (1/3.39MHz)",
"notes": [ "notes": [
"analyse uints --etu 10analyse uints --us 100" "analyse uints --etu 10",
"analyse uints --us 100"
], ],
"offline": true, "offline": true,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"--etu <dec> number in ETU", "--etu <dec> number in ETU",
"--us <dec> number in micro seconds (us)" "--us <dec> number in micro seconds (us)",
"-t, --selftest self tests"
], ],
"usage": "analyse units [-h] [--etu <dec>] [--us <dec>]" "usage": "analyse units [-ht] [--etu <dec>] [--us <dec>]"
}, },
"auto": { "auto": {
"command": "auto", "command": "auto",
@ -204,6 +206,20 @@
], ],
"usage": "data asn1 [-ht] [-d <hex>]" "usage": "data asn1 [-ht] [-d <hex>]"
}, },
"data atr": {
"command": "data atr",
"description": "look up ATR record from bytearray",
"notes": [
"data atr -d 3B6B00000031C064BE1B0100079000"
],
"offline": true,
"options": [
"-h, --help This help",
"-d <hex> ASN1 encoded byte array",
"-t, --test perform selftest"
],
"usage": "data atr [-ht] [-d <hex>]"
},
"data autocorr": { "data autocorr": {
"command": "data autocorr", "command": "data autocorr",
"description": "Autocorrelate over window is used to detect repeating sequences. We use it as detection of how long in bits a message inside the signal is", "description": "Autocorrelate over window is used to detect repeating sequences. We use it as detection of how long in bits a message inside the signal is",
@ -1170,7 +1186,7 @@
}, },
"hf 14a list": { "hf 14a list": {
"command": "hf 14a list", "command": "hf 14a list",
"description": "Alias of `trace list -t 14a` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t 14a -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf 14a list --frame -> show frame delay times", "hf 14a list --frame -> show frame delay times",
"hf 14a list -1 -> use trace buffer" "hf 14a list -1 -> use trace buffer"
@ -3166,7 +3182,7 @@
}, },
"hf iclass list": { "hf iclass list": {
"command": "hf iclass list", "command": "hf iclass list",
"description": "Alias of `trace list -t iclass` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t iclass -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf iclass list --frame -> show frame delay times", "hf iclass list --frame -> show frame delay times",
"hf iclass list -1 -> use trace buffer" "hf iclass list -1 -> use trace buffer"
@ -3836,7 +3852,7 @@
}, },
"hf lto list": { "hf lto list": {
"command": "hf lto list", "command": "hf lto list",
"description": "Alias of `trace list -t lto` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t lto -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf lto list --frame -> show frame delay times", "hf lto list --frame -> show frame delay times",
"hf lto list -1 -> use trace buffer" "hf lto list -1 -> use trace buffer"
@ -4591,7 +4607,7 @@
}, },
"hf mf list": { "hf mf list": {
"command": "hf mf list", "command": "hf mf list",
"description": "Alias of `trace list -t mf` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t mf -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf mf list --frame -> show frame delay times", "hf mf list --frame -> show frame delay times",
"hf mf list -1 -> use trace buffer" "hf mf list -1 -> use trace buffer"
@ -5803,7 +5819,7 @@
}, },
"hf mfdes list": { "hf mfdes list": {
"command": "hf mfdes list", "command": "hf mfdes list",
"description": "Alias of `trace list -t des` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t des -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf mfdes list --frame -> show frame delay times", "hf mfdes list --frame -> show frame delay times",
"hf mfdes list -1 -> use trace buffer" "hf mfdes list -1 -> use trace buffer"
@ -6216,7 +6232,7 @@
}, },
"hf mfp list": { "hf mfp list": {
"command": "hf mfp list", "command": "hf mfp list",
"description": "Alias of `trace list -t mfp` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t mfp -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf mfp list --frame -> show frame delay times", "hf mfp list --frame -> show frame delay times",
"hf mfp list -1 -> use trace buffer" "hf mfp list -1 -> use trace buffer"
@ -6494,7 +6510,7 @@
}, },
"hf mfu list": { "hf mfu list": {
"command": "hf mfu list", "command": "hf mfu list",
"description": "Alias of `trace list -t 14a` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t 14a -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf 14a list --frame -> show frame delay times", "hf 14a list --frame -> show frame delay times",
"hf 14a list -1 -> use trace buffer" "hf 14a list -1 -> use trace buffer"
@ -7064,7 +7080,7 @@
}, },
"hf topaz list": { "hf topaz list": {
"command": "hf topaz list", "command": "hf topaz list",
"description": "Alias of `trace list -t topaz` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol", "description": "Alias of `trace list -t topaz -c` with selected protocol data to annotate trace buffer You can load a trace from file (see `trace load -h`) or it be downloaded from device by default It accepts all other arguments of `trace list`. Note that some might not be relevant for this specific protocol",
"notes": [ "notes": [
"hf topaz list --frame -> show frame delay times", "hf topaz list --frame -> show frame delay times",
"hf topaz list -1 -> use trace buffer" "hf topaz list -1 -> use trace buffer"
@ -11803,8 +11819,8 @@
} }
}, },
"metadata": { "metadata": {
"commands_extracted": 684, "commands_extracted": 685,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-07-27T21:41:37" "extracted_on": "2023-08-02T20:39:48"
} }
} }

5
doc/commands.md
View file

@ -120,11 +120,12 @@ Check column "offline" for their availability.
|`data zerocrossings `|Y |`Count time between zero-crossings` |`data zerocrossings `|Y |`Count time between zero-crossings`
|`data convertbitstream `|Y |`Convert GraphBuffer's 0/1 values to 127 / -127` |`data convertbitstream `|Y |`Convert GraphBuffer's 0/1 values to 127 / -127`
|`data getbitstream `|Y |`Convert GraphBuffer's >=1 values to 1 and <1 to 0` |`data getbitstream `|Y |`Convert GraphBuffer's >=1 values to 1 and <1 to 0`
|`data asn1 `|Y |`asn1 decoder` |`data asn1 `|Y |`ASN1 decoder`
|`data atr `|Y |`ATR lookup`
|`data bin2hex `|Y |`Converts binary to hexadecimal` |`data bin2hex `|Y |`Converts binary to hexadecimal`
|`data bitsamples `|N |`Get raw samples as bitstring` |`data bitsamples `|N |`Get raw samples as bitstring`
|`data clear `|Y |`Clears bigbuf on deviceside and graph window` |`data clear `|Y |`Clears bigbuf on deviceside and graph window`
|`data diff `|Y |`diff of input files` |`data diff `|Y |`Diff of input files`
|`data hexsamples `|N |`Dump big buffer as hex bytes` |`data hexsamples `|N |`Dump big buffer as hex bytes`
|`data hex2bin `|Y |`Converts hexadecimal to binary` |`data hex2bin `|Y |`Converts hexadecimal to binary`
|`data load `|Y |`Load contents of file into graph window` |`data load `|Y |`Load contents of file into graph window`