Skip to content

Commit

Permalink
text
Browse files Browse the repository at this point in the history
  • Loading branch information
iceman1001 committed Apr 15, 2021
1 parent 4f3447a commit fde48cd
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
6 changes: 5 additions & 1 deletion doc/colors_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## Table of Contents
* [style/color](#style_color)
* [Proxspace](#proxspace)
* [](#)
* [help texts](#help-texts)

The client should autodetect color support when starting.

Expand Down Expand Up @@ -48,3 +48,7 @@ Most commands doesn't use a header yet. We added it to make it standout (ie: yel
^[Top](#top)
Proxspace has support for colors.


## Help texts
^[Top](#top)
The help text uses a hard coded template deep inside the cliparser.c file.
16 changes: 8 additions & 8 deletions doc/magic_cards_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ Android compatible
### Proxmark3 commands

```
hf mf wrbl 0 A FFFFFFFFFFFF 11223344440804006263646566676869
hf mf wrbl --blk 0 -k FFFFFFFFFFFF -d 11223344440804006263646566676869
```

When "soft-bricked" (by writing invalid data in block0), these ones may help:
Expand All @@ -342,8 +342,8 @@ e.g. for 4b UID:

```
hf 14a config --atqa force --bcc ignore --cl2 skip --rats skip
hf mf wrbl 0 A FFFFFFFFFFFF 11223344440804006263646566676869 # for 1k
hf mf wrbl 0 A FFFFFFFFFFFF 11223344441802006263646566676869 # for 4k
hf mf wrbl --blk 0 -k FFFFFFFFFFFF -k 11223344440804006263646566676869 # for 1k
hf mf wrbl --blk 0 -k FFFFFFFFFFFF -k 11223344441802006263646566676869 # for 4k
hf 14a config --std
hf 14a reader
```
Expand All @@ -352,8 +352,8 @@ e.g. for 7b UID:

```
hf 14a config --atqa force --bcc ignore --cl2 force --cl3 skip --rats skip
hf mf wrbl 0 A FFFFFFFFFFFF 04112233445566084400626364656667 # for 1k
hf mf wrbl 0 A FFFFFFFFFFFF 04112233445566184200626364656667 # for 4k
hf mf wrbl --blk 0 -k FFFFFFFFFFFF -k 04112233445566084400626364656667 # for 1k
hf mf wrbl --blk 0 -k FFFFFFFFFFFF -k 04112233445566184200626364656667 # for 4k
hf 14a config --std
hf 14a reader
```
Expand Down Expand Up @@ -585,7 +585,7 @@ Issue three regular MFU write commands in a row to write first three blocks.
### Proxmark3 commands

```
hf mfu setuid
hf mfu setuid -h
```

Equivalent: don't use `hf mfu wrbl` as you need to write three blocks in a row, but do, with proper BCCx:
Expand All @@ -605,7 +605,7 @@ hf 14a config -h
E.g.:
```
hf 14a config --atqa force --bcc ignore --cl2 force --cl3 skip --rats skip
hf mfu setuid 04112233445566
hf mfu setuid --uid 04112233445566
hf 14a config --std
hf 14a reader
```
Expand Down Expand Up @@ -825,7 +825,7 @@ It accepts longer UID but that doesn't affect BCC/ATQA/SAK
The same effect (with better ATQA!) can be obtained with a MFC Gen1A that uses SAK defined in block0:

```
hf mf csetblk 0 1122334444204403A1A2A3A4A5A6A7A8
hf mf csetblk --blk 0 -d 1122334444204403A1A2A3A4A5A6A7A8
hf 14a info
[+] UID: 11 22 33 44
[+] ATQA: 03 44
Expand Down
8 changes: 4 additions & 4 deletions doc/trace_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ The unit for this time information depends on the protocol in use:
* Reader Mode: Timings are in ticks (1us == 1.5ticks)
* Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)
* Hitag1 / Hitag2 / HitagS: Elementary Time Unit (ETU) is 8µs
* iClass, ISO15693, ISO18092 and FeliCa have no accurate timing information at the moment
* iCLASS, ISO15693, ISO18092 and FeliCa have no accurate timing information at the moment
* For others timing is not available

By specifying the option ```f``` (e.g. ```trace list 14a f```) the frame delay times are shown. (So you don't have to do the math by your own).
By specifying the option ```f``` (e.g. ```trace list -t 14a -f```) the frame delay times are shown. (So you don't have to do the math by your own).

### Sources
^[Top](#top)
Expand Down Expand Up @@ -88,14 +88,14 @@ To get a more detailed explanation of the transmitted data for ISO14443A traces

To do so

* use `trace list 14a x`
* use `trace list -t 14a -x`
* copy the output (starting with the timestamp) into a textfile
* run `text2pcap -t "%S." -l 264 -n <input-text-file> <output-pcapng-file>`
* now open your pcapng file in Wireshark or read it with the CLI version `tshark`

An example frame

with `trace list 14a`:
with `trace list -t 14a`:

```
19072 | 29536 | Rdr |93 70 88 04 cf ff bc 7f bb | ok | SELECT_UID
Expand Down

0 comments on commit fde48cd

Please sign in to comment.