Merge branch 'master' into dev_4x50_standalone

update
2021-02-12 23:21:49 +01:00
parent a944ff5927 1ce9053c51
commit ac0ef23d5e
79 changed files with 2201 additions and 1396 deletions
--- a/doc/cheatsheet.md
+++ b/doc/cheatsheet.md
@@ -332,9 +332,9 @@ pm3 --> hf mfu info
 Clone MIFARE Ultralight EV1 Sequence
 ```
 pm3 --> hf mfu dump -k FFFFFFFF
-pm3 --> script run hf_mfu_dumptoemulator -i hf-mfu-XXXX-dump.bin -o hf-mfu-XXXX-dump.eml
+pm3 --> script run data_mfu_bin2eml -i hf-mfu-XXXX-dump.bin -o hf-mfu-XXXX-dump.eml
 pm3 --> hf mfu eload -u -f hf-mfu-XXXX-dump.eml
-pm3 --> hf mfu sim -t 7 -f hf-mfu-XXXX-dump.eml
+pm3 --> hf mfu sim -t 7
 ```

 Bruteforce MIFARE Classic card numbers from 11223344 to 11223346
--- a/doc/cliparser.md
+++ b/doc/cliparser.md
@@ -55,10 +55,14 @@ It will also add the `-h --help` option automatic.
    -h --help       : help
    --cn            : card number
    --fn            : facility number
-    --q5            : target is lf q5 card
+    --q5            : target is LF T5555/Q5 card
+    --em            : target is LF EM4305/4469 card
    --raw           : raw data
+    -d --data       : hex data supplied
+    -f --file       : filename supplied
    -k --key        : key supplied
    -n --keyno      : key number to use
+    -p --pwd        : password supplied
    -v --verbose    : flag when output should provide more information, not considered debug.
    -1 --buffer     : use the sample buffer

--- a/doc/cliparser_todo.txt
+++ b/doc/cliparser_todo.txt
@@ -93,14 +93,6 @@ hf mf gen3uid
 hf mf gen3blk
 hf mf gen3freeze
 hf mf ice
-lf config
-lf cmdread
-lf read
-lf sim
-lf simask
-lf simfsk
-lf simpsk
-lf sniff
 lf em 410x
 lf em 4x05
 lf em 4x50
@@ -111,15 +103,11 @@ lf hitag writer
 lf hitag dump
 lf hitag cc
 lf t55xx config
-lf t55xx dangerraw
-lf t55xx detect
 lf t55xx dump
 lf t55xx info
 lf t55xx read
 lf t55xx resetread
 lf t55xx restore
 lf t55xx trace
-lf t55xx wakeup
 lf t55xx write
-lf t55xx special
 script run
--- a/doc/commands.md
+++ b/doc/commands.md
@@ -433,6 +433,7 @@ Check column "offline" for their availability.
 |`hf mfdes getuid        `|N       |`Get random uid`
 |`hf mfdes info          `|N       |`Tag information`
 |`hf mfdes list          `|Y       |`List DESFire (ISO 14443A) history`
+|`hf mfdes bruteaid      `|N       |`Recover AIDs by bruteforce`
 |`hf mfdes createaid     `|N       |`Create Application ID`
 |`hf mfdes deleteaid     `|N       |`Delete Application ID`
 |`hf mfdes selectaid     `|N       |`Select Application ID`
@@ -534,13 +535,13 @@ Check column "offline" for their availability.
 |-------                  |------- |-----------
 |`lf help                `|Y       |`This help`
 |`lf config              `|N       |`Get/Set config for LF sampling, bit/sample, decimation, frequency`
-|`lf cmdread             `|N       |`Modulate LF reader field to send command before read (all periods in microseconds)`
+|`lf cmdread             `|N       |`Modulate LF reader field to send command before read`
 |`lf read                `|N       |`Read LF tag`
-|`lf search              `|Y       |`Read and Search for valid known tag (in offline mode it you can load first then search)`
-|`lf sim                 `|N       |`Simulate LF tag from buffer with optional GAP (in microseconds)`
-|`lf simask              `|N       |`Simulate LF ASK tag from demodbuffer or input`
-|`lf simfsk              `|N       |`Simulate LF FSK tag from demodbuffer or input`
-|`lf simpsk              `|N       |`Simulate LF PSK tag from demodbuffer or input`
+|`lf search              `|Y       |`Read and Search for valid known tag`
+|`lf sim                 `|N       |`Simulate LF tag from buffer`
+|`lf simask              `|N       |`Simulate ASK tag`
+|`lf simfsk              `|N       |`Simulate FSK tag`
+|`lf simpsk              `|N       |`Simulate PSK tag`
 |`lf simbidir            `|N       |`Simulate LF tag (with bidirectional data transmission between reader and tag)`
 |`lf sniff               `|N       |`Sniff LF traffic between reader and tag`
 |`lf tune                `|N       |`Continuously measure LF antenna tuning`
--- a/doc/jtag_notes.md
+++ b/doc/jtag_notes.md
@@ -8,7 +8,7 @@ The RDV4 repository contains helper scripts for JTAG flashing.

 * Get OpenOCD, e.g.: `apt-get install openocd`
 * Create `tools/jtag_openocd/openocd_configuration` by copying [`tools/jtag_openocd/openocd_configuration.sample`](/tools/jtag_openocd/openocd_configuration.sample)
-* Tune it to fit your JTAG tool: adapt `CONFIG_IF` to refer to the `interface-*.cfg` file corresponding to your JTAG tool. By default `openocd_configuration.sample` is set up to work with the J-Link.
+* Tune it to fit your JTAG tool: adapt `CONFIG_IF` to refer to your JTAG tool. `openocd_configuration.sample` contains several examples and is set up by default to work with the J-Link.
 * Wire the Proxmark3 to the JTAG tool. How to do it depends on the tool. See below for examples. **Warning:** don't plug the Proxmark3 on USB if the tool delivers already the voltage to the Proxmark3, which is most probably the case.
 * Then just run

@@ -25,7 +25,7 @@ For advanced usages there are also `openocd_flash_dump.sh` for dumping the conte

 The RDV4 JTAG header is quite smaller compared to other Proxmark3 platforms.  
 If you're using a J-Link, there is a [convenient adapter](https://github.com/RfidResearchGroup/proxmark3/wiki/Tools#jtag-adapter) made by Proxgrind.  
-You can also make yours with some 1.27mm headers (look for `1.27mm header` on Aliexpress) or Pogo pins.
+You can also make yours with some 1.27mm headers (look for `1.27mm header` on Aliexpress) or Pogo pins or buy an already made clip, e.g. search `dykb clamp` on Aliexpress and take a 1.27mm single-row 6P version.

 ## JLink pinout