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

fix a number of strx usages

Browse source
This commit is contained in:
Philippe Teuwen 2022-01-01 02:37:00 +01:00
commit 7a5786b9e4
23 changed files with 95 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/cliparser.md
View file

@ -139,7 +139,7 @@ e.g. lf indala clone -r a0000000a0002021 -> this uses .....
arg_param_begin,
arg_lit0("l", "long", "optional - long UID 224 bits"),
arg_int0("c", "heden", "<decimal>", "Cardnumber for Heden 2L format"),
arg_strx0("r", "raw", "<hex>", "raw bytes"),
arg_str0("r", "raw", "<hex>", "raw bytes"),
arg_lit0("q", "Q5", "optional - specify writing to Q5/T5555 tag"),
arg_int0(NULL, "fc", "<decimal>", "Facility Code (26 bit format)"),
arg_int0(NULL, "cn", "<decimal>", "Cardnumber (26 bit format)"),

112
doc/commands.json
View file

@ -76,9 +76,9 @@
"offline": true,
"options": [
"-h, --help this help",
"-r, --raw <hex> raw bytes (strx)"
"-r, --raw <hex> raw bytes"
],
"usage": "analyse foo [-h] [-r <hex>]..."
"usage": "analyse foo [-h] -r <hex>"
},
"analyse freq": {
"command": "analyse freq",
@ -227,7 +227,7 @@
"-h, --help this help",
"-d, --data <bin> binary string to convert"
],
"usage": "data bin2hex [-h] [-d <bin>]..."
"usage": "data bin2hex [-h] -d <bin>"
},
"data bitsamples": {
"command": "data bitsamples",
@ -831,7 +831,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "emv list [-h1fcrux] [--dict <file>]..."
"usage": "emv list [-h1fcrux] [--dict <file>]"
},
"emv pse": {
"command": "emv pse",
@ -941,11 +941,11 @@
"-h, --help this help",
"-s, -s, --select activate field and select card",
"-k, -k, --keep keep field for next command",
"-a, -a, --apdu show apdu reqests and responses",
"-a, -a, --apdu show apdu requests and responses",
"-t, -t, --tlv tlv decode results",
"-w, -w, --wired send data via contact (iso7816) interface. contactless interface set by default."
],
"usage": "emv select [-hskatw] [<hex applet aid>]..."
"usage": "emv select [-hskatw] <hex applet aid>"
},
"emv test": {
"command": "emv test",
@ -1055,7 +1055,7 @@
"--p2 <hex> start value of p2 (1 hex byte)",
"-r, --reset <number> minimum secondes before resetting the tag (to prevent timeout issues). default is 5 minutes",
"-e, --error-limit <number> maximum times an status word other than 0x9000 or 0x6d00 is shown. default is 512.",
"-s, --skip-ins <hex> do not test an instructions (can be specified multiple times)",
"-s, --skip-ins <hex> do not test an instruction (can be specified multiple times)",
"-l, --with-le search for apdus with le=0 (case 2s) as well",
"-v, --verbose verbose output"
],
@ -1093,7 +1093,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf 14a list [-h1fcrux] [--dict <file>]..."
"usage": "hf 14a list [-h1fcrux] [--dict <file>]"
},
"hf 14a info": {
"command": "hf 14a info",
@ -1226,7 +1226,7 @@
"-h, --help this help",
"-f, --file <filename> (optional) filename, if no <name> uid will be used as filename"
],
"usage": "hf 14b dump [-h] [-f <filename>]..."
"usage": "hf 14b dump [-h] [-f <filename>]"
},
"hf 14b help": {
"command": "hf 14b help",
@ -1251,7 +1251,7 @@
"-d, --data <hex> <apdu | data> if `m` parameter included",
"--timeout <dec> timeout in ms"
],
"usage": "hf 14b apdu [-hskte] [--decode] [-m <hex>] [-l <int>] -d <hex> [-d <hex>]... [--timeout <dec>]"
"usage": "hf 14b apdu [-hskte] [--decode] [-m <hex>] [-l <int>] -d <hex> [--timeout <dec>]"
},
"hf 14b info": {
"command": "hf 14b info",
@ -1286,7 +1286,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf 14b list [-h1fcrux] [--dict <file>]..."
"usage": "hf 14b list [-h1fcrux] [--dict <file>]"
},
"hf 14b ndefread": {
"command": "hf 14b ndefread",
@ -1323,7 +1323,7 @@
"-v, --verbose verbose",
"-d, --data <hex> data, bytes to send"
],
"usage": "hf 14b raw [-hkscrv] [--sr] [--cts] [-t <dec>] [-d <hex>]..."
"usage": "hf 14b raw [-hkscrv] [--sr] [--cts] [-t <dec>] [-d <hex>]"
},
"hf 14b rdbl": {
"command": "hf 14b rdbl",
@ -1363,7 +1363,7 @@
"-h, --help this help",
"-u, --uid hex 4byte uid/pupi"
],
"usage": "hf 14b sim [-h] [-u hex]..."
"usage": "hf 14b sim [-h] -u hex"
},
"hf 14b sniff": {
"command": "hf 14b sniff",
@ -1473,7 +1473,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf 15 list [-h1fcrux] [--dict <file>]..."
"usage": "hf 15 list [-h1fcrux] [--dict <file>]"
},
"hf 15 info": {
"command": "hf 15 info",
@ -1510,7 +1510,7 @@
"-r do not read response",
"-d, --data <hex> raw bytes to send"
],
"usage": "hf 15 raw [-h2ckr] -d <hex> [-d <hex>]..."
"usage": "hf 15 raw [-h2ckr] -d <hex>"
},
"hf 15 rdbl": {
"command": "hf 15 rdbl",
@ -1898,7 +1898,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf emrtd list [-h1fcrux] [--dict <file>]..."
"usage": "hf emrtd list [-h1fcrux] [--dict <file>]"
},
"hf epa preplay": {
"command": "hf epa preplay",
@ -1974,7 +1974,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf felica list [-h1fcrux] [--dict <file>]..."
"usage": "hf felica list [-h1fcrux] [--dict <file>]"
},
"hf felica info": {
"command": "hf felica info",
@ -2031,7 +2031,7 @@
"-s active signal field on with select",
"<hex> raw bytes to send"
],
"usage": "hf felica raw [-hackrs] [-n <dec>] <hex> [<hex>]..."
"usage": "hf felica raw [-hackrs] [-n <dec>] <hex>"
},
"hf felica rdbl": {
"command": "hf felica rdbl",
@ -2260,7 +2260,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf fido list [-h1fcrux] [--dict <file>]..."
"usage": "hf fido list [-h1fcrux] [--dict <file>]"
},
"hf fido info": {
"command": "hf fido info",
@ -2334,7 +2334,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf list [-h1fcrux] [--dict <file>]..."
"usage": "hf list [-h1fcrux] [--dict <file>]"
},
"hf iclass calcnewkey": {
"command": "hf iclass calcnewkey",
@ -2553,7 +2553,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf iclass list [-h1fcrux] [--dict <file>]..."
"usage": "hf iclass list [-h1fcrux] [--dict <file>]"
},
"hf iclass loclass": {
"command": "hf iclass loclass",
@ -2874,7 +2874,7 @@
"-k, --keep keep field on for next command",
"-a, --apdu show apdu reqests and responses"
],
"usage": "hf ksx6924 initialize [-hka] <mpda 4byte hex> [<mpda 4byte hex>]..."
"usage": "hf ksx6924 initialize [-hka] <mpda 4byte hex>"
},
"hf ksx6924 prec": {
"command": "hf ksx6924 prec",
@ -2888,7 +2888,7 @@
"-k, --keep keep field on for next command",
"-a, --apdu show apdu reqests and responses"
],
"usage": "hf ksx6924 prec [-hka] <record 1byte hex> [<record 1byte hex>]..."
"usage": "hf ksx6924 prec [-hka] <record 1byte hex>"
},
"hf ksx6924 select": {
"command": "hf ksx6924 select",
@ -2989,7 +2989,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf legic list [-h1fcrux] [--dict <file>]..."
"usage": "hf legic list [-h1fcrux] [--dict <file>]"
},
"hf legic info": {
"command": "hf legic info",
@ -3135,7 +3135,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf lto list [-h1fcrux] [--dict <file>]..."
"usage": "hf lto list [-h1fcrux] [--dict <file>]"
},
"hf lto rdbl": {
"command": "hf lto rdbl",
@ -3746,7 +3746,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf mf list [-h1fcrux] [--dict <file>]..."
"usage": "hf mf list [-h1fcrux] [--dict <file>]"
},
"hf mf mad": {
"command": "hf mf mad",
@ -4087,7 +4087,7 @@
"-i, --step <dec> increment step when bruteforcing",
"-m, --mad only bruteforce the mad range"
],
"usage": "hf mfdes bruteaid [-hm] [-s <hex>]... [-e <hex>]... [-i <dec>]"
"usage": "hf mfdes bruteaid [-hm] [-s <hex>] [-e <hex>] [-i <dec>]"
},
"hf mfdes changekey": {
"command": "hf mfdes changekey",
@ -4186,7 +4186,7 @@
"-i, --kdfi <kdfi> kdf input (hex 1-31 bytes)",
"-a, --apdu show apdu requests and responses"
],
"usage": "hf mfdes chk [-hva] [--aid <aid>]... [-k <key>] [-d <file>] [--pattern1b] [--pattern2b] [--startp2b <pattern>] [-j <file>] [-f <kdf>] [-i <kdfi>]"
"usage": "hf mfdes chk [-hva] [--aid <aid>] [-k <key>] [-d <file>] [--pattern1b] [--pattern2b] [--startp2b <pattern>] [-j <file>] [-f <kdf>] [-i <kdfi>]"
},
"hf mfdes chkeysettings": {
"command": "hf mfdes chkeysettings",
@ -4873,7 +4873,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf mfdes list [-h1fcrux] [--dict <file>]..."
"usage": "hf mfdes list [-h1fcrux] [--dict <file>]"
},
"hf mfdes lsapp": {
"command": "hf mfdes lsapp",
@ -5244,7 +5244,7 @@
"-v, --verbose show internal data.",
"-k, --key <hex> key, 16 hex bytes"
],
"usage": "hf mfp initp [-hv] [-k <hex>]..."
"usage": "hf mfp initp [-hv] [-k <hex>]"
},
"hf mfp mad": {
"command": "hf mfp mad",
@ -5354,7 +5354,7 @@
"--ki <hex> key number, 2 hex bytes",
"--key <hex> key, 16 hex bytes"
],
"usage": "hf mfp wrp [-hv] --ki <hex> [--key <hex>]..."
"usage": "hf mfp wrp [-hv] --ki <hex> [--key <hex>]"
},
"hf mfu cauth": {
"command": "hf mfu cauth",
@ -5654,7 +5654,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf seos list [-h1fcrux] [--dict <file>]..."
"usage": "hf seos list [-h1fcrux] [--dict <file>]"
},
"hf sniff": {
"command": "hf sniff",
@ -5702,7 +5702,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf st25ta list [-h1fcrux] [--dict <file>]..."
"usage": "hf st25ta list [-h1fcrux] [--dict <file>]"
},
"hf st25ta ndefread": {
"command": "hf st25ta ndefread",
@ -5798,7 +5798,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf thinfilm list [-h1fcrux] [--dict <file>]..."
"usage": "hf thinfilm list [-h1fcrux] [--dict <file>]"
},
"hf thinfilm sim": {
"command": "hf thinfilm sim",
@ -5833,7 +5833,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "hf topaz list [-h1fcrux] [--dict <file>]..."
"usage": "hf topaz list [-h1fcrux] [--dict <file>]"
},
"hf topaz info": {
"command": "hf topaz info",
@ -6356,7 +6356,7 @@
"--q5 optional - specify writing to q5/t5555 tag",
"--em optional - specify writing to em4305/4469 tag"
],
"usage": "lf destron clone [-h] -u <hex> [-u <hex>]... [--q5] [--em]"
"usage": "lf destron clone [-h] -u <hex> [--q5] [--em]"
},
"lf destron help": {
"command": "lf destron help",
@ -7143,7 +7143,7 @@
"-h, --help this help",
"-r, --raw <hex> raw bytes"
],
"usage": "lf gproxii demod [-h] [-r <hex>]..."
"usage": "lf gproxii demod [-h] [-r <hex>]"
},
"lf gproxii reader": {
"command": "lf gproxii reader",
@ -7248,7 +7248,7 @@
"--em optional - specify writing to em4305/4469 tag",
"--bin <bin> binary string i.e 0001001001"
],
"usage": "lf hid clone [-h] [-w <format>] [--fc <dec>] [--cn <dec>] [-i <dec>] [-o <dec>] [-r <hex>]... [--q5] [--em] [--bin <bin>]"
"usage": "lf hid clone [-h] [-w <format>] [--fc <dec>] [--cn <dec>] [-i <dec>] [-o <dec>] [-r <hex>] [--q5] [--em] [--bin <bin>]"
},
"lf hid help": {
"command": "lf hid help",
@ -7295,7 +7295,7 @@
"-o, --oem <dec> oem code",
"-r, --raw <hex> raw bytes"
],
"usage": "lf hid sim [-h] [-w <format>] [--fc <dec>] [--cn <dec>] [-i <dec>] [-o <dec>] [-r <hex>]..."
"usage": "lf hid sim [-h] [-w <format>] [--fc <dec>] [--cn <dec>] [-i <dec>] [-o <dec>] [-r <hex>]"
},
"lf hid watch": {
"command": "lf hid watch",
@ -7386,7 +7386,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "lf hitag list [-h1fcrux] [--dict <file>]..."
"usage": "lf hitag list [-h1fcrux] [--dict <file>]"
},
"lf hitag reader": {
"command": "lf hitag reader",
@ -7481,7 +7481,7 @@
"--q5 optional - specify writing to q5/t5555 tag",
"--em optional - specify writing to em4305/4469 tag"
],
"usage": "lf idteck clone [-h] [-r <hex>]... [--q5] [--em]"
"usage": "lf idteck clone [-h] -r <hex> [--q5] [--em]"
},
"lf idteck help": {
"command": "lf idteck help",
@ -7519,7 +7519,7 @@
"-h, --help this help",
"-r, --raw <hex> raw bytes"
],
"usage": "lf idteck sim [-h] [-r <hex>]..."
"usage": "lf idteck sim [-h] -r <hex>"
},
"lf indala altdemod": {
"command": "lf indala altdemod",
@ -7556,7 +7556,7 @@
"--em optional - specify writing to em4305/4469 tag",
"--4041x optional - specify indala 4041x format, must use with fc and cn"
],
"usage": "lf indala clone [-h] [-r <hex>]... [--heden <decimal>] [--fc <decimal>] [--cn <decimal>] [--q5] [--em] [--4041x]"
"usage": "lf indala clone [-h] [-r <hex>] [--heden <decimal>] [--fc <decimal>] [--cn <decimal>] [--q5] [--em] [--4041x]"
},
"lf indala help": {
"command": "lf indala help",
@ -7606,7 +7606,7 @@
"-r, --raw <hex> raw bytes",
"--heden <decimal> cardnumber for heden 2l format"
],
"usage": "lf indala sim [-h] [-r <hex>]... [--heden <decimal>]"
"usage": "lf indala sim [-h] [-r <hex>] [--heden <decimal>]"
},
"lf io clone": {
"command": "lf io clone",
@ -7803,7 +7803,7 @@
"--q5 optional - specify writing to q5/t5555 tag",
"--em optional - specify writing to em4305/4469 tag"
],
"usage": "lf motorola clone [-h] -r <hex> [-r <hex>]... [--q5] [--em]"
"usage": "lf motorola clone [-h] -r <hex> [--q5] [--em]"
},
"lf motorola help": {
"command": "lf motorola help",
@ -9001,7 +9001,7 @@
"--q5 optional - specify writing to q5/t5555 tag",
"--em optional - specify writing to em4305/4469 tag"
],
"usage": "lf viking clone [-h] [--cn <hex>]... [--q5] [--em]"
"usage": "lf viking clone [-h] --cn <hex> [--q5] [--em]"
},
"lf viking help": {
"command": "lf viking help",
@ -9039,7 +9039,7 @@
"-h, --help this help",
"--cn <hex> 8 digit hex viking card number"
],
"usage": "lf viking sim [-h] [--cn <hex>]..."
"usage": "lf viking sim [-h] --cn <hex>"
},
"lf visa2000 clone": {
"command": "lf visa2000 clone",
@ -9138,7 +9138,7 @@
"-f, --file <filename> file name",
"-c, --cols <dec> column breaks (def 32)"
],
"usage": "mem dump [-hv] [-o <dec>] [-l <dec>] [-f <filename>]... [-c <dec>]"
"usage": "mem dump [-hv] [-o <dec>] [-l <dec>] [-f <filename>] [-c <dec>]"
},
"mem help": {
"command": "mem help",
@ -9188,7 +9188,7 @@
"-t, --t55xx upload 4 bytes keys (password dictionary)",
"-f, --file <filename> file name"
],
"usage": "mem load [-hmit] [-o <dec>] [-f <filename>]..."
"usage": "mem load [-hmit] [-o <dec>] -f <filename>"
},
"mem spiffs check": {
"command": "mem spiffs check",
@ -9404,7 +9404,7 @@
"or to import into wireshark using encapsulation type \"iso 14443\"",
"--dict <file> use dictionary keys file"
],
"usage": "smart list [-h1fcrux] [--dict <file>]..."
"usage": "smart list [-h1fcrux] [--dict <file>]"
},
"nfc barcode sim": {
"command": "nfc barcode sim",
@ -9435,7 +9435,7 @@
"-f, --file <fn> file to load",
"-v, --verbose verbose mode"
],
"usage": "nfc decode [-hv] [-d <hex>]... [-f <fn>]"
"usage": "nfc decode [-hv] [-d <hex>] [-f <fn>]"
},
"nfc mf help": {
"command": "nfc mf help",
@ -9968,7 +9968,7 @@
"-t, --type <string> protocol to annotate the trace",
"--dict <file> use dictionary keys file"
],
"usage": "trace list [-h1fcrux] [-t <string>]... [--dict <file>]..."
"usage": "trace list [-h1fcrux] [-t <string>] [--dict <file>]"
},
"trace load": {
"command": "trace load",
@ -9981,7 +9981,7 @@
"-h, --help this help",
"-f, --file <filename> trace file to load"
],
"usage": "trace load [-h] [-f <filename>]..."
"usage": "trace load [-h] -f <filename>"
},
"trace save": {
"command": "trace save",
@ -9994,7 +9994,7 @@
"-h, --help this help",
"-f, --file <filename> trace file to save"
],
"usage": "trace save [-h] [-f <filename>]..."
"usage": "trace save [-h] -f <filename>"
},
"usart btfactory": {
"command": "usart btfactory",
@ -10119,7 +10119,7 @@
"-r, --raw <hex> raw hex to be decoded",
"-b, --bin <bin> binary string to be decoded"
],
"usage": "wiegand decode [-h] [-r <hex>]... [-b <bin>]"
"usage": "wiegand decode [-h] [-r <hex>] [-b <bin>]"
},
"wiegand encode": {
"command": "wiegand encode",
@ -10156,6 +10156,6 @@
"metadata": {
"commands_extracted": 597,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2021-12-31T11:53:15"
"extracted_on": "2022-01-01T01:38:04"
}
}