From 8472c6ffe7c3a8450fc84e945018851fc7f9cd32 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 29 Jul 2021 15:00:00 +0200 Subject: [PATCH] make style --- armsrc/lfsampling.c | 16 +-- client/src/cmdhficlass.c | 30 ++--- client/src/cmdlf.c | 2 +- doc/commands.json | 230 ++++++++++++++++++++++++++++++--------- doc/commands.md | 16 +-- 5 files changed, 213 insertions(+), 81 deletions(-) diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index 19ea3188d..f478b7378 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -30,14 +30,14 @@ Default LF config is set to: */ static sample_config def_config = { - .decimation = 1, - .bits_per_sample = 8, - .averaging = 1, - .divisor = LF_DIVISOR_125, - .trigger_threshold = 0, - .samples_to_skip = 0, - .verbose = false, - }; + .decimation = 1, + .bits_per_sample = 8, + .averaging = 1, + .divisor = LF_DIVISOR_125, + .trigger_threshold = 0, + .samples_to_skip = 0, + .verbose = false, +}; static sample_config config = { 1, 8, 1, LF_DIVISOR_125, 0, 0, true} ; diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 56b3c82a4..d18878526 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -3718,25 +3718,25 @@ static int CmdHFiClassEncode(const char *Cmd) { } if (bin_len) { - memcpy(credential + 8, data, sizeof(data)); + memcpy(credential + 8, data, sizeof(data)); } else { - wiegand_message_t packed; - memset(&packed, 0, sizeof(wiegand_message_t)); + wiegand_message_t packed; + memset(&packed, 0, sizeof(wiegand_message_t)); - int format_idx = HIDFindCardFormat((char *)format); - if (format_idx == -1) { - PrintAndLogEx(WARNING, "Unknown format: " _YELLOW_("%s"), format); - return PM3_EINVARG; - } + int format_idx = HIDFindCardFormat((char *)format); + if (format_idx == -1) { + PrintAndLogEx(WARNING, "Unknown format: " _YELLOW_("%s"), format); + return PM3_EINVARG; + } - if (HIDPack(format_idx, &card, &packed, false) == false) { - PrintAndLogEx(WARNING, "The card data could not be encoded in the selected format."); - return PM3_ESOFT; - } - add_HID_header(&packed); + if (HIDPack(format_idx, &card, &packed, false) == false) { + PrintAndLogEx(WARNING, "The card data could not be encoded in the selected format."); + return PM3_ESOFT; + } + add_HID_header(&packed); - packed.Bot = BSWAP_32(packed.Bot); - memcpy(credential + 12, &packed.Bot, sizeof(packed.Bot)); + packed.Bot = BSWAP_32(packed.Bot); + memcpy(credential + 12, &packed.Bot, sizeof(packed.Bot)); } // encrypt with transport key diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index 164965257..9d94c25c5 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -436,7 +436,7 @@ int CmdFlexdemod(const char *Cmd) { /* * this function will save a copy of the current lf config value, and set config to default values. -* +* */ int lf_config_savereset(sample_config *config) { diff --git a/doc/commands.json b/doc/commands.json index 62dade65a..dc268bdda 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -973,7 +973,7 @@ }, "help": { "command": "help", - "description": "help use ` help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210726.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save", + "description": "help use ` help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log /home/iceman/.proxmark3/logs/log_20210729.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save", "notes": [ "auto" ], @@ -2414,9 +2414,10 @@ }, "hf iclass encode": { "command": "hf iclass encode", - "description": "encode binary wiegand to block 7", + "description": "encode binary wiegand to block 7 use either --bin or --wiegand/--fc/--cn", "notes": [ "hf iclass encode --bin 10001111100000001010100011 --ki 0 -> fc 31 cn 337", + "hf iclass encode --fc 31 --cn 337 --ki 0 -> fc 31 cn 337", "hf iclass encode --bin 10001111100000001010100011 --ki 0 --elite -> fc 31 cn 337, writing w elite key" ], "offline": true, @@ -2427,9 +2428,12 @@ "--credit key is assumed to be the credit key", "--elite elite computations applied to key", "--raw no computations applied to key", - "--enckey 3des transport key, 16 hex bytes" + "--enckey 3des transport key, 16 hex bytes", + "--fc facility code", + "--cn card number", + "-w, --wiegand see `wiegand list` for available formats" ], - "usage": "hf iclass encode [-h] --bin --ki [--credit] [--elite] [--raw] [--enckey ]" + "usage": "hf iclass encode [-h] [--bin ] --ki [--credit] [--elite] [--raw] [--enckey ] [--fc ] [--cn ] [-w ]" }, "hf iclass encrypt": { "command": "hf iclass encrypt", @@ -4032,15 +4036,16 @@ "-s, --schann secure channel: d40/ev1/ev2", "--aid application id (3 hex bytes, big endian)", "--fid file id (1 hex byte)", - "--rawdata file settings (hex > 5 bytes)", + "--rawdata file settings (hex > 5 bytes). have priority over the other settings.", "--amode file access mode: plain/mac/encrypt", + "--rawrights access rights for file (hex 2 byte) r/w/rw/chg, 0x0 - 0xd key, 0xe free, 0xf denied", "--rrights read file access mode: the specified key, free, deny", "--wrights write file access mode: the specified key, free, deny", "--rwrights read/write file access mode: the specified key, free, deny", "--chrights change file settings access mode: the specified key, free, deny", "--no-auth execute without authentication" ], - "usage": "hf mfdes chfilesettings [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--rawdata ] [--amode ] [--rrights ] [--wrights ] [--rwrights ] [--chrights ] [--no-auth]" + "usage": "hf mfdes chfilesettings [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--rawdata ] [--amode ] [--rawrights ] [--rrights ] [--wrights ] [--rwrights ] [--chrights ] [--no-auth]" }, "hf mfdes chk": { "command": "hf mfdes chk", @@ -4093,19 +4098,30 @@ ], "usage": "hf mfdes chkeysettings [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [-d ]" }, - "hf mfdes clearfile": { - "command": "hf mfdes clearfile", - "description": "clear record file make sure to select aid or authenticate aid before running this command.", + "hf mfdes clearrecfile": { + "command": "hf mfdes clearrecfile", + "description": "clear record file. master key needs to be provided or flag --no-auth set (depend on cards settings).", "notes": [ - "hf mfdes clearfile -n 01" + "hf mfdes clearrecfile --aid 123456 --fid 01 -> clear record file for: app=123456, file=01 with defaults from `default` command" ], "offline": false, "options": [ "-h, --help this help", - "-n, --fileno file number (0 - 31)", - "-a, --aid app id to select as hex bytes (3 bytes, big endian)" + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--fid file id for clearing (1 hex byte)", + "--no-auth execute without authentication" ], - "usage": "hf mfdes clearfile [-h] [-n ] [-a ]..." + "usage": "hf mfdes clearrecfile [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--no-auth]" }, "hf mfdes createapp": { "command": "hf mfdes createapp", @@ -4209,25 +4225,81 @@ ], "usage": "hf mfdes createfile [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--isofid ] [--rawtype ] [--rawdata ] [--amode ] [--rawrights ] [--rrights ] [--wrights ] [--rwrights ] [--chrights ] [--no-auth] [--size ] [--backup]" }, - "hf mfdes createrecordfile": { - "command": "hf mfdes createrecordfile", - "description": "create linear / cyclic record file make sure to select aid or authenticate aid before running this command.", + "hf mfdes createmacfile": { + "command": "hf mfdes createmacfile", + "description": "create transaction mac file in the application. application master key needs to be provided or flag --no-auth set (depend on application settings).", "notes": [ - "hf mfdes createrecordfile -f 1122 -n 02 -c 0 -r eeee -s 000010 -m 000005 -a 123456" + "--rawrights have priority over the separate rights settings.", + "key/mode/etc of the authentication depends on application settings", + "hf mfdes createmacfile --aid 123456 --fid 01 --mackey --rawrights 1f30 00112233445566778899aabbccddeeff --mackeyver 01 -> create transaction mac file with parameters. rights from default. authentication with defaults from `default` command", + "hf mfdes createmacfile --aid 123456 --fid 01 --amode plain --rrights free --wrights deny --rwrights free --chrights key0 --mackey 00112233445566778899aabbccddeeff -> create file app=123456, file=01, with key, and mentioned rights with defaults from `default` command", + "hf mfdes createmacfile -n 0 -t des -k 0000000000000000 -f none --aid 123456 --fid 01 -> execute with default factory setup. key and keyver == 0x00..00" ], "offline": false, "options": [ "-h, --help this help", - "-n, --fileno file number (0 - 31)", - "-f, --fileid iso fid (2 hex bytes, big endian)", - "-c, --com communication setting (0 = plain, 1 = plain + mac, 3 = enciphered)", - "-r, --rights access rights (2 hex bytes -> rw/chg/r/w, 0x0 - 0xd key, 0xe free, 0xf denied)", - "-s, --size record size (3 hex bytes, big endian, 000001 to ffffff)", - "-m, --maxrecord max. number of records (3 hex bytes, big endian)", - "-b, --cyclic create cyclic record file instead of linear record file", - "-a, --aid app id to select as hex bytes (3 bytes, big endian)" + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--fid file id (1 hex byte)", + "--amode file access mode: plain/mac/encrypt", + "--rawrights access rights for file (hex 2 byte) r/w/rw/chg, 0x0 - 0xd key, 0xe free, 0xf denied", + "--rrights read file access mode: the specified key, free, deny", + "--wrights write file access mode: the specified key, free, deny", + "--rwrights read/write file access mode: the specified key, free, deny", + "--chrights change file settings access mode: the specified key, free, deny", + "--no-auth execute without authentication", + "--mackey aes-128 key for mac (16 hex bytes, big endian). default 0x00..00", + "--mackeyver aes key version for mac (1 hex byte). default 0x00" ], - "usage": "hf mfdes createrecordfile [-hb] [-n ] [-f ]... [-c ] [-r ]... [-s ]... [-m ]... [-a ]..." + "usage": "hf mfdes createmacfile [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--amode ] [--rawrights ] [--rrights ] [--wrights ] [--rwrights ] [--chrights ] [--no-auth] [--mackey ] [--mackeyver ]" + }, + "hf mfdes createrecordfile": { + "command": "hf mfdes createrecordfile", + "description": "create linear/cyclic record file in the application. application master key needs to be provided or flag --no-auth set (depend on application settings).", + "notes": [ + "--rawrights have priority over the separate rights settings.", + "key/mode/etc of the authentication depends on application settings", + "hf mfdes createrecordfile --aid 123456 --fid 01 --size 000010 --maxrecord 000010 --cyclic -> create cyclic record file with parameters. rights from default. authentication with defaults from `default` command", + "hf mfdes createrecordfile --aid 123456 --fid 01 --amode plain --rrights free --wrights free --rwrights free --chrights key0 --size 000010 --maxrecord 000010 -> create linear record file app=123456, file=01 and mentioned rights with defaults from `default` command", + "hf mfdes createrecordfile -n 0 -t des -k 0000000000000000 -f none --aid 123456 --fid 01 --size 000010 --maxrecord 000010 -> execute with default factory setup" + ], + "offline": false, + "options": [ + "-h, --help this help", + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--fid file id (1 hex byte)", + "--isofid iso file id (2 hex bytes)", + "--amode file access mode: plain/mac/encrypt", + "--rawrights access rights for file (hex 2 byte) r/w/rw/chg, 0x0 - 0xd key, 0xe free, 0xf denied", + "--rrights read file access mode: the specified key, free, deny", + "--wrights write file access mode: the specified key, free, deny", + "--rwrights read/write file access mode: the specified key, free, deny", + "--chrights change file settings access mode: the specified key, free, deny", + "--no-auth execute without authentication", + "--size record size (3 hex bytes, big endian, 000001 to ffffff)", + "--maxrecord max. number of records (3 hex bytes, big endian)", + "--cyclic create cyclic record file instead of linear record file" + ], + "usage": "hf mfdes createrecordfile [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--isofid ] [--amode ] [--rawrights ] [--rrights ] [--wrights ] [--rwrights ] [--chrights ] [--no-auth] [--size ] [--maxrecord ] [--cyclic]" }, "hf mfdes createvaluefile": { "command": "hf mfdes createvaluefile", @@ -4634,23 +4706,58 @@ ], "usage": "hf mfdes list [-h1fcrux] [--dict ]..." }, - "hf mfdes read": { - "command": "hf mfdes read", - "description": "read data from file make sure to select aid or authenticate aid before running this command.", + "hf mfdes lsfiles": { + "command": "hf mfdes lsfiles", + "description": "show file list. master key needs to be provided or flag --no-auth set (depend on cards settings).", "notes": [ - "hf mfdes read -n 1 -t 0 -o 000000 -l 000000 -a 123456", - "hf mfdes read -n 1 -t 0 -> read all data from standard file, fileno 1" + "hf mfdes lsfiles --aid 123456 -> show file list for: app=123456 with defaults from `default` command" ], "offline": false, "options": [ "-h, --help this help", - "-n, --fileno file number (0 - 31)", - "-o, --offset file offset (3 hex bytes, big endian)", - "-l, --length length to read (3 hex bytes, big endian -> 000000 = read all data)", - "-t, --type file type (0 = standard / backup, 1 = record)", - "-a, --aid app id to select (3 hex bytes, big endian)" + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--no-auth execute without authentication" ], - "usage": "hf mfdes read [-h] [-n ] [-o ]... [-l ]... [-t ] [-a ]..." + "usage": "hf mfdes lsfiles [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--no-auth]" + }, + "hf mfdes read": { + "command": "hf mfdes read", + "description": "read data from file. key needs to be provided or flag --no-auth set (depend on file settings).", + "notes": [ + "hf mfdes read --aid 123456 --fid 01 -> read file: app=123456, file=01, offset=0, all the data. use default channel settings from `default` command", + "hf mfdes read --aid 123456 --fid 01 --type record --offset 000000 --length 000001 -> read one last record from record file. use default channel settings from `default` command" + ], + "offline": false, + "options": [ + "-h, --help this help", + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--fid file id (1 hex byte)", + "--no-auth execute without authentication", + "--type file type auto/data(standard/backup)/value/record(linear/cyclic)/mac). auto - check file settings and then read. default: auto", + "-o, --offset file offset (3 hex bytes, big endian). for records - record number (0 - lastest record). default 0", + "-l, --length length to read (3 hex bytes, big endian -> 000000 = read all data). for records - records count (0 - all). default 0." + ], + "usage": "hf mfdes read [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--no-auth] [--type ] [-o ] [-l ]" }, "hf mfdes selectaid": { "command": "hf mfdes selectaid", @@ -4734,20 +4841,42 @@ }, "hf mfdes write": { "command": "hf mfdes write", - "description": "write data to file make sure to select aid or authenticate aid before running this command.", + "description": "write data from file. key needs to be provided or flag --no-auth set (depend on file settings).", "notes": [ - "hf mfdes write -n 01 -t 0 -o 000000 -d 3132333435363738" + "hf mfdes write --aid 123456 --fid 01 -d 01020304 -> write file: app=123456, file=01, offset=0, get file type from card. use default channel settings from `default` command", + "hf mfdes write --aid 123456 --fid 01 --type data -d 01020304 --0ffset 000100 -> write data to std file with offset 0x100", + "hf mfdes write --aid 123456 --fid 01 --type data -d 01020304 --commit -> write data to backup file with commit", + "hf mfdes write --aid 123456 --fid 01 --type value -d 00000001 -> increment value file", + "hf mfdes write --aid 123456 --fid 01 --type value -d 00000001 --debit -> decrement value file", + "hf mfdes write --aid 123456 --fid 01 -d 01020304 -> write data to record file with `auto` type", + "hf mfdes write --aid 123456 --fid 01 --type record -d 01020304 -> write data to record file", + "hf mfdes write --aid 123456 --fid 01 --type record -d 01020304 --updaterec 0 -> update record in the record file. record 0 - lastest record.", + "hf mfdes write --aid 123456 --fid 01 --type record --offset 000000 -d 11223344 -> write record to record file. use default channel settings from `default` command" ], "offline": false, "options": [ "-h, --help this help", - "-n, --fileno file number (0 - 31)", - "-o, --offset file offset (3 hex bytes, big endian), optional", - "-d, --data data to write (hex bytes, 256 bytes max)", - "-t, --type file type (0 = standard / backup, 1 = record)", - "-a, --aid app id to select as hex bytes (3 bytes, big endian)" + "-a, --apdu show apdu requests and responses", + "-v, --verbose show technical data", + "-n, --keyno key number", + "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authenticate (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", + "-f, --kdf key derivation function (kdf): none, an10922, gallagher", + "-i, --kdfi kdf input (hex 1-31 bytes)", + "-m, --cmode communicaton mode: plain/mac/encrypt", + "-c, --ccset communicaton command set: native/niso/iso", + "-s, --schann secure channel: d40/ev1/ev2", + "--aid application id (3 hex bytes, big endian)", + "--fid file id (1 hex byte)", + "--no-auth execute without authentication", + "--type file type auto/data(standard/backup)/value/record(linear/cyclic)/mac). auto - check file settings and then write. default: auto", + "-o, --offset file offset (3 hex bytes, big endian). for records - record number (0 - lastest record). default 0", + "-d, --data data for write (data/record file), credit/debit(value file)", + "--debit use for value file debit operation instead of credit", + "--commit commit needs for backup file only. for the other file types and in the `auto` mode - command set it automatically.", + "--updaterec record number for update record command. updates record instead of write. lastest record - 0" ], - "usage": "hf mfdes write [-h] [-n ] [-o ]... [-d ]... [-t ] [-a ]..." + "usage": "hf mfdes write [-hav] [-n ] [-t ] [-k ] [-f ] [-i ] [-m ] [-c ] [-s ] [--aid ] [--fid ] [--no-auth] [--type ] [-o ] [-d ] [--debit] [--commit] [--updaterec ]" }, "hf mfp auth": { "command": "hf mfp auth", @@ -5531,8 +5660,8 @@ "command": "hw connect", "description": "connects to a proxmark3 device via specified serial port. baudrate here is only for physical uart or uart-bt, not for usb-cdc or blue shark add-on", "notes": [ - "hw connect -p com3", - "hw connect -p com3 -b 115200" + "hw connect -p /dev/ttyacm0", + "hw connect -p /dev/ttyacm0 -b 115200" ], "offline": true, "options": [ @@ -6750,7 +6879,8 @@ "lf config -> shows current config", "lf config -b 8 --125 -> samples at 125 khz, 8 bps", "lf config -b 4 --134 --dec 3 -> samples at 134 khz, averages three samples into one, stored with a resolution of 4 bits per sample", - "lf config --trig 20 -s 10000 -> trigger sampling when above 20, skip 10 000 first samples after triggered" + "lf config --trig 20 -s 10000 -> trigger sampling when above 20, skip 10 000 first samples after triggered", + "lf config --reset -> reset back to default values" ], "offline": true, "options": [ @@ -9682,8 +9812,8 @@ } }, "metadata": { - "commands_extracted": 585, + "commands_extracted": 587, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2021-07-26T14:56:39" + "extracted_on": "2021-07-29T12:40:22" } } \ No newline at end of file diff --git a/doc/commands.md b/doc/commands.md index 5dab75938..baf7ab98a 100644 --- a/doc/commands.md +++ b/doc/commands.md @@ -525,17 +525,19 @@ Check column "offline" for their availability. |`hf mfdes getappnames `|N |`[new]Get Applications list` |`hf mfdes getfileids `|N |`[new]Get File IDs list` |`hf mfdes getfileisoids `|N |`[new]Get File ISO IDs list` -|`hf mfdes getfilesettings`|N |`[new]Get file settings` -|`hf mfdes chfilesettings`|N |`[new]Change file settings` -|`hf mfdes clearfile `|N |`Clear record File` +|`hf mfdes lsfiles `|N |`[new]Show all files list` +|`hf mfdes dump `|N |`Dump all files` |`hf mfdes createfile `|N |`[new]Create Standard/Backup File` |`hf mfdes createvaluefile`|N |`[new]Create Value File` -|`hf mfdes createrecordfile`|N |`Create Linear/Cyclic Record File` +|`hf mfdes createrecordfile`|N |`[new]Create Linear/Cyclic Record File` +|`hf mfdes createmacfile `|N |`[new]Create Transaction MAC File` |`hf mfdes deletefile `|N |`[new]Delete File` -|`hf mfdes dump `|N |`Dump all files` +|`hf mfdes getfilesettings`|N |`[new]Get file settings` +|`hf mfdes chfilesettings`|N |`[new]Change file settings` +|`hf mfdes read `|N |`[new]Read data from standard/backup/record/value/mac file` +|`hf mfdes write `|N |`[new]Write data to standard/backup/record/value file` |`hf mfdes value `|N |`[new]Operations with value file (get/credit/limited credit/debit/clear)` -|`hf mfdes read `|N |`Read data from standard/backup/record file` -|`hf mfdes write `|N |`Write data to standard/backup/record file` +|`hf mfdes clearrecfile `|N |`[new]Clear record File` |`hf mfdes test `|Y |`Test crypto`