RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 16:56:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
16388 commits 3 branches 14 tags 86 MiB
Commit graph

90 commits

Author SHA1 Message Date
Philippe Teuwen 8ac8e3d7d0 reduce variable scopes 2023-01-15 02:23:19 +01:00
iceman1001 9888eef8dc changed hf mf wrbl and view command to look for strict readonly ACL in the data. 2023-01-06 23:53:25 +01:00
iceman1001 e77781e621 only mark CRC bytes if we have 3 or more bytes, and increase the line buffer since ansi colors eats chars 2022-12-31 10:04:30 +01:00
iceman1001 a6c09505ce change token for !crc -> !! and added colors to it 2022-12-03 12:35:22 +01:00
nvx 4962752472 Fix trace list -r (relative times) not working unless the -u (microseconds) flag was also provided. 
Also makes the `--frame` option respect microseconds and relative times as well.
 2022-12-02 20:13:13 +10:00
iceman1001 5b790afe43 renamed param dict / f for more consistency overall 2022-11-20 16:48:20 +01:00
iceman1001 9353f8ce9a fix coverity CID #402839, resource leak 2022-11-11 23:51:30 +01:00
iceman1001 4b54c79104 fix a square bracket missing in trace list -c when annotating crc bytes. Added color support for crc bytes and square brackets when no ansi colors is supported 2022-11-04 21:10:47 +01:00
Doridian 6ed6571430 code scan has an issue with this i guess 2022-06-11 16:38:58 -07:00
Doridian 1a4437550b all cmd done 2022-06-11 15:40:33 -07:00
Philippe Teuwen 8ecbd88251 codeql: fix printf 2022-02-27 13:53:43 +01:00
Philippe Teuwen 623169fe02 fix some CodeQL warnings 2022-02-16 20:28:38 +01:00
iceman1001 2eaa60e95e cppcheck 2022-02-16 00:20:02 +01:00
iceman1001 1e35567e15 extra ev2 challenges 2022-02-06 20:56:33 +01:00
merlokk 3ae9070dd8 make style 2022-02-05 13:32:50 +02:00
iceman1001 57d0397436 added trace extract, it extracts auth challengens in MFU-C/ICLASS/DESFIRE and prints it. 2022-01-30 21:18:59 +01:00
Philippe Teuwen 140a7f34a4 make style 2022-01-23 20:02:57 +01:00
iceman1001 c9a1ff6e60 skeleton for seos annotations 2022-01-16 19:03:17 +01:00
Philippe Teuwen 30aa7aa7d1 Adapting license headers, WIP 2022-01-08 00:40:52 +01:00
iceman1001 7b61c35948 textual change to trace list -h 2022-01-03 22:12:30 +01:00
Philippe Teuwen 89554501bb trace list: check protocol exists and allows to run without arg 2022-01-02 00:13:20 +01:00
iceman1001 77f49c8efc text - unified 2022-01-01 09:39:05 +01:00
Philippe Teuwen 7a5786b9e4 fix a number of strx usages 2022-01-01 02:39:10 +01:00
Philippe Teuwen eb3c48cd25 make style 2021-12-30 12:41:23 +01:00
Philippe Teuwen 85def31a8d hitag1/S trace: add crc check 
Example:

[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 272 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 272 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -t hitags -c
[=] downloading tracelog data from device
[+] Recorded activity (trace len = 272 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)                                           | CRC | Annotation
------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------
          0 |          0 | Rdr |18(5)                                                                    |     |
        117 |        117 | Tag |21  a5  b4 [73]                                                          | !crc|
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]                                                |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 00 [ab]                                                            |  ok |
        117 |        117 | Tag |21  a5  b4  73 [53]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 01 [b6]                                                            |  ok |
        117 |        117 | Tag |c9  00  00  aa [75]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 02 [91]                                                            |  ok |
        117 |        117 | Tag |48  54  4f  4e [2c]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 03 [8c]                                                            |  ok |
        117 |        117 | Tag |4d  49  4b  52 [1e]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 04 [df]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 05 [c2]                                                            |  ok |
        117 |        117 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 06 [e5]                                                            |  ok |
        118 |        118 | Tag |00  00  00  00 [a6]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 07 [f8]                                                            |  ok |
        118 |        118 | Tag |57  5f  4f  4b [88]                                                      |  ok |
          0 |          0 | Rdr |0c(4) 08 [43]                                                            |  ok |
 2021-12-30 01:46:41 +01:00
Philippe Teuwen 8a85702662 hitags: don't record SOF in trace and demodulate AC frame 2021-12-30 01:11:12 +01:00
Philippe Teuwen 323f70ff7a Add partial byte annotation in Hitag traces 
Example:
[usb] pm3 --> trace load -f traces/lf_HitagS256_dump.trace
[+] loaded 287 bytes from binary file traces/lf_HitagS256_dump.trace
[+] Recorded Activity (TraceLen = 287 bytes)
[?] try `trace list -1 -t ...` to view trace.  Remember the `-1` param
[usb] pm3 --> trace list -1 -t hitags -c
[+] Recorded activity (trace len = 287 bytes)
[=] start = start of start frame end = end of frame. src = source of transfer
[=] Hitag1 / Hitag2 / HitagS - Timings in ETU (8us)

      Start |        End | Src | Data (! denotes parity error)
------------+------------+-----+-----------------------------------------
          0 |          0 | Rdr |18(5)
        117 |        117 | Tag |0f(4) 2c  ab  cc  b3  cf  32  bf [2f]
          0 |          0 | Rdr |00(5) 21  a5  b4  73 [8c]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 00 [ab]
        117 |        117 | Tag |0f(4) 21  a5  b4  73 [53]
          0 |          0 | Rdr |0c(4) 01 [b6]
        117 |        117 | Tag |0f(4) c9  00  00  aa [75]
          0 |          0 | Rdr |0c(4) 02 [91]
        117 |        117 | Tag |0f(4) 48  54  4f  4e [2c]
          0 |          0 | Rdr |0c(4) 03 [8c]
        117 |        117 | Tag |0f(4) 4d  49  4b  52 [1e]
          0 |          0 | Rdr |0c(4) 04 [df]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 05 [c2]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 06 [e5]
        117 |        117 | Tag |0f(4) 00  00  00  00 [a6]
          0 |          0 | Rdr |0c(4) 07 [f8]
        117 |        117 | Tag |0f(4) 57  5f  4f  4b [88]
          0 |          0 | Rdr |0c(4) 08 [43]
 2021-12-29 23:48:16 +01:00
Philippe Teuwen e5d7ce61e6 MFULC trace: detect when known key is used during auth 2021-10-15 01:31:24 +02:00
iceman1001 347b5c9614 textual 2021-09-22 22:30:25 +02:00
Philippe Teuwen 58dda7a809 rename static globals g_* as gs_*, keep g_ only for exported globals 2021-08-22 00:51:37 +02:00
Philippe Teuwen 6197482b77 Make sure g_trace is null when not allocated 2021-08-21 14:34:20 +02:00
Ray Lee fd314882b2 fix double free 2021-08-21 16:59:56 +08:00
Philippe Teuwen 66d35ae0b1 fix tip 2021-06-23 09:53:27 +02:00
Philippe Teuwen ab140b926a fix tip 2021-06-23 09:52:29 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 99a82cf7d2 coverity fixes 2021-04-19 23:31:11 +02:00
iceman1001 bb9cf8ec40 make sure there is room for null terminator 2021-04-19 23:25:13 +02:00
iceman1001 5604afce7a trace list - now colors whole reader line output. Also little nasty buff-underflow bug fixed 2021-04-19 22:18:37 +02:00
Philippe Teuwen 2e925d5da3 hf 14a list & CmdTraceListAlias: simplify 2021-04-19 21:21:47 +02:00
Philippe Teuwen 4dea429157 hf 14a list helptext handling by CmdTraceListAlias, to be generalized if ok 2021-04-19 14:35:09 +02:00
Philippe Teuwen 4c228b6c64 fix handling of trace list -1 with empty trace buffer 2021-04-19 14:22:15 +02:00
iceman1001 27dafa2bb0 marking of crc bytes overwrote first hex char 2021-03-10 14:08:33 +01:00
Philippe Teuwen 64a04498bd Add reader parity errors on MFC traces 2021-03-10 13:52:26 +01:00
Anže Jenšterle cd36770c5e
make style 2021-02-09 16:56:55 +01:00
iceman1001 6737f6f3cd sanitize fix - lf/hf tune heap overflow 2021-01-28 20:31:39 +01:00
Eloff 2218b4e7db minor fix 2021-01-27 14:43:50 +03:00
McEloff 11b94e7748 trace list -t mf - now can use external dictionary keys file 2021-01-27 01:14:20 +03:00
Philippe Teuwen 43dc10e7f0 hf trace list: fix 14b CRC & accept 14a/14b crcs in 7816 2020-12-18 02:37:31 +01:00
iceman1001 ee3c0faee1 hf iclass -helptexts 2020-12-05 13:27:39 +01:00
tcprst 2eac5d8dd4 Fix missing hyphens on command examples 2020-11-02 01:53:30 +01:00