Commit graph

3158 commits

Author SHA1 Message Date
Philippe Teuwen 7f37958144 Enable support to clone HID on EM4x05 2022-04-30 00:08:10 +02:00
Philippe Teuwen 185a45e749 Add support for cloning Viking and EM410x on EM4x05 2022-04-29 17:32:52 +02:00
Philippe Teuwen 4d264fa63c Preparing EM4100 clone to EM4305 2022-04-29 16:44:38 +02:00
acru3l f57879cbcb Fix felica_sendraw 2022-04-27 11:38:28 +09:00
iceman1001 d15eef80af removed dead link 2022-04-16 19:11:53 +02:00
iceman1001 2dd250ab80 fix initialization of bitstream buffer 2022-04-10 13:15:24 +02:00
iceman1001 8d9dd8b346 make style 2022-04-09 18:48:13 +02:00
Iceman aec3ff64e2
Merge pull request #1654 from wh201906/standalone_14a
Make HF_14ASNIFF standalone mode compatible with old PM3 (without flashmem)
2022-04-07 18:45:39 +02:00
wh201906 eb1e94f385
Show DownloadTraceInstructions only when the trace data is written to the flashmem 2022-04-07 19:46:50 +08:00
wh201906 3d6c21e44a
Add flashmem support for HF_14BSNIFF standalone mode 2022-04-07 19:39:49 +08:00
wh201906 dc50563ce8
Make HF_14ASNIFF standalone mode compatible with old PM3 (without flashmem) 2022-04-07 16:21:02 +08:00
Jacopo Jannone 26e6f1a584 Implement 14b sniff standalone mode 2022-04-03 02:25:35 +02:00
iceman1001 247790b833 text 2022-03-31 23:33:20 +02:00
iceman1001 95d1631bed style 2022-03-23 18:22:03 +01:00
iceman1001 df49565c04 style 2022-03-23 17:49:09 +01:00
iceman1001 7aeb462e18 convert 15readercommand to use NG frames. Removing the confusing of status and length of received package in same return param. Now returns proper status and length is a ref param 2022-03-23 17:37:40 +01:00
giraut 42f4888f1c Encode ISO15693 response as tag byte by byte, instead of 2 bytes by 2 bytes, so that responses with an odd number of bytes don't end up encoded and transmitted with an extraneous uninitialized byte after the CRC. 2022-03-21 20:22:27 +02:00
iceman1001 178f9bb142 pcs param is sometimes NULL here 2022-03-20 09:35:37 +01:00
Iceman bda8062bff
Merge pull request #1627 from lnv42/iso15rawSlowAnd2SC
[iso15] Add support for recieving slow and/or dual subcarriers answers from any raw commands
2022-03-20 07:59:25 +01:00
Iceman b22e908fb9
Merge pull request #1626 from lnv42/iso15sniffslow1sc
Improve iso15 sniffing: add support for slow answers with single subcarrier
2022-03-20 07:59:13 +01:00
Iceman d4fece64ec
Merge pull request #1621 from lnv42/iso15sniff2sc
Improve iso15 sniffing: add support for dual subcarriers sniffing
2022-03-20 07:58:58 +01:00
Yann GASCUEL d1e186dbe9 iso15: fix 2SC (FSK) slow decoding
Previous decoding "count" constants have too large scale that may bug
with some answer. With those new constants, this bug can't happend anymore.
2022-03-16 17:36:37 +01:00
Yann GASCUEL abb840558f iso15: add support for slow and 2SC to GetIso15693AnswerFromTag()
Allow running raw iso15 cmd expecting slow and/or dual subcarriers
answers. E.g. sending slow 2SC inventory ("hf 15 raw -c -d 250100") is
now working.
2022-03-16 17:25:27 +01:00
Yann GASCUEL f65ca5f14c iso15 sniff: add support for slow answers with single subcarrier
Before this commit, slow answers was only supported for dual
subcarriers answers.
2022-03-16 16:11:50 +01:00
Yann GASCUEL a387f6774e iso15: move FSK code up (before all functions that may use it) 2022-03-16 16:09:57 +01:00
Yann GASCUEL 3880ef8da3 iso15 sniff: add support for slow answers with single subcarrier
Before this commit, slow answers was only supported for dual
subcarriers answers.
2022-03-16 16:00:02 +01:00
Yann GASCUEL 352850d158 iso15: update TODO / BUGS / ISSUES with support of iso15 2SC sniff 2022-03-16 15:54:14 +01:00
Yann GASCUEL c5f216558c iso15sniff: add an "iclass" bool parameter to SniffIso15693()
This is required to disable ISO15 flags parsing when sniffing iClass
because those flags don't exist in iClass coms (iClass iso15 based
communications are always fast and using only one subcarrier).
2022-03-16 11:26:07 +01:00
Yann GASCUEL 6d37410d33 iso15 sniff: fix alignment 2022-03-08 17:29:34 +01:00
Yann GASCUEL 3e784557fc iso15 sniff: improve iso15 FSK decoding (ARM part) 2022-03-08 10:11:34 +01:00
Yann GASCUEL 38d49097f9 iso15 sniffing: intragrate 2SC sniffing in same FPGA mode
switching Fpgamode while sniffing with FpgaWriteConfWord() was
sometimes too long so the tag answer start was lost.
Now, (only with FPGA_BITSTREAM_HF_15) with "FPGA_HF_READER_MODE_SNIFF_AMPLITUDE |
FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ": the amplitude is shrank
from its 2 LSB bits and those 2 bits are now used to return the current
frequency. From my tests, this 2 bits reduction does not affect
quality of 1SC sniffing, but it may have slightly reduced the
receiving range.

FPGA FSK decoding code is also improved.
2022-03-08 10:11:14 +01:00
Yann GASCUEL 1f7bce5580 iso15 sniffing: add support for dual subcarriers tag answers 2022-03-08 10:11:08 +01:00
Yann GASCUEL 9010a4b828 make HF_15SNIFF standalone mode compatible with old pm3 (without flash) 2022-03-08 10:10:17 +01:00
Philippe Teuwen 47096906fb arm Adc: Fix codeql warnings 2022-02-27 15:03:54 +01:00
Philippe Teuwen c44aa8a8c4 arm felica: Fix codeql warnings 2022-02-27 15:00:50 +01:00
Philippe Teuwen 28cdbeea4c arm em4x50: Fix codeql warnings 2022-02-27 14:58:16 +01:00
Philippe Teuwen 53671b127b arm fpgaloader: Fix codeql warnings 2022-02-27 14:55:38 +01:00
Philippe Teuwen dc17bb506a arm utils: Fix codeql warnings 2022-02-27 14:54:11 +01:00
Philippe Teuwen 9849156f37 arm 14a/mifare: Fix codeql warnings 2022-02-27 14:54:11 +01:00
Iceman 1c6abece54
Merge branch 'master' into sha 2022-02-25 11:42:20 +01:00
iceman1001 3b5a1e8de5 added some helptexts 2022-02-24 19:31:47 +01:00
iceman1001 07855611e4 unify text 2022-02-24 18:03:19 +01:00
iceman1001 638e892088 added device side option to disable EAS/AFI password. Sets to all ZEROS 2022-02-18 18:23:53 +01:00
r1ddl3rz 61f3398fdc fix slixdisable pass id 2022-02-18 11:47:20 +01:00
Philippe Teuwen 359ca554c0 Simplify firmware image generation and preserve original sections 2022-02-17 01:43:41 +01:00
Philippe Teuwen e17ff8260f visual clue in case of data decompression error at boot time 2022-02-17 01:43:41 +01:00
Philippe Teuwen 14f62eaa88 armsrc check: skip if no src available; postpone warning 2022-02-17 01:43:41 +01:00
Philippe Teuwen d0526d3ba9 Remove mkversion.pl 2022-02-17 01:43:00 +01:00
Uli Heilmeier 12ed4f1fdf Standalone mode hf_legicsim
Add a standalone mode to simulate Legic Prime dumps stored on flash
2022-02-15 17:26:05 +01:00
iceman1001 a4bc2c5521 make style 2022-02-14 21:44:15 +01:00
iceman1001 63bc9b5eb2 added legic view command, and converted OLD -> NG comms 2022-02-14 09:19:35 +01:00
iceman1001 ec59acf64c style 2022-02-12 17:46:34 +01:00
Łukasz Jurczyk 0d62e01027
Added new standalone mode lf_em4100rsww 2022-02-10 17:49:58 +01:00
merlokk 3ae9070dd8 make style 2022-02-05 13:32:50 +02:00
mwalker33 3ca13ce293 Update mifareutil.c
Mifare debug bug.  nr is a uint8_t size of 4 and did note output correctly.
2022-01-31 17:19:44 +11:00
iceman1001 4fb83368f5 style 2022-01-29 10:40:29 +01:00
iceman1001 a37fdb1ccf added getversion response for 14a -t 3, (simulation of desfire anticollision) 2022-01-26 06:51:34 +01:00
Philippe Teuwen 140a7f34a4 make style 2022-01-23 20:02:57 +01:00
iceman1001 b246a2a53e make zero check stricter 2022-01-22 18:34:57 +01:00
iceman1001 98d291f5b1 fix hf 14a sim, on device side a sneaky detection if data started with zero, it would treat it as uid is in emulator memory. Also fixed a size issue on flag 2022-01-22 18:29:11 +01:00
iceman1001 7bbca12335 desfire atqa should be 0x44 2022-01-22 16:52:32 +01:00
iceman1001 1731695483 Revert "Release v4.14831 - Frostbit"
This reverts commit 0b65f2bc9e.
2022-01-11 19:17:19 +01:00
iceman1001 0b65f2bc9e Release v4.14831 - Frostbit 2022-01-11 19:17:19 +01:00
Philippe Teuwen 33ef5f4243 use ARRAYLEN 2022-01-09 14:25:10 +01:00
iceman1001 0942ce7a68 refactory parity files a bit 2022-01-09 13:34:54 +01:00
Philippe Teuwen e34870a732 text 2022-01-08 01:47:30 +01:00
Philippe Teuwen 8f402c5861 text 2022-01-08 01:26:51 +01:00
Nate Glaser a06c88e728 Makefile.hal change to remove 693 2022-01-07 19:18:41 -05:00
Nate Glaser 0579b8f63c Made requested changes -- I think 2022-01-07 19:07:29 -05:00
Nate Glaser 323248060e changed description 2022-01-07 18:16:41 -05:00
Nate Glaser d5842d9d92 changed beginning of 15693 sniff file 2022-01-07 18:12:28 -05:00
Nate Glaser 43fc71673a 15693 sniff - Makefile/hf_15693sniff.c 2022-01-07 18:02:08 -05:00
iceman1001 6bb301f4da cppcheck fixes for const 2022-01-06 23:07:47 +01:00
Philippe Teuwen ebba11b3f5 make style 2022-01-06 20:05:26 +01:00
Philippe Teuwen a315254a88 style 2022-01-06 19:46:35 +01:00
iceman1001 b98d518fd7 style 2022-01-06 19:41:45 +01:00
iceman1001 b3731c6003 cppcheck fixes 2022-01-06 18:18:48 +01:00
iceman1001 e550f8ccc8 cppcheck fixes for const 2022-01-06 15:40:11 +01:00
iceman1001 0bb9c43354 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-06 15:24:35 +01:00
iceman1001 b55a33b1d7 cppcheck fixes for const 2022-01-06 15:22:36 +01:00
Philippe Teuwen 8f77179a2f remove unused file 2022-01-06 11:25:38 +01:00
Philippe Teuwen bcafc5d03c some historical copyright adjustments, thanks @iceman1001! 2022-01-06 11:24:04 +01:00
Philippe Teuwen b703bb746b Adapting license headers, WIP 2022-01-06 02:20:38 +01:00
Philippe Teuwen 5561466fe8 make style 2022-01-05 18:56:56 +01:00
iceman1001 224e2f68b2 cppcheck fix 2022-01-04 07:36:31 +01:00
Philippe Teuwen 0f9315391a Changed drastically Hitag S ARM code to remove state machines and ease way to build new commands, Fixed Hitag S crypto mode with key or NrAr, fixed lf hitag cc, fixed pwd dump in hitagS dump with LKP 2022-01-03 22:43:58 +01:00
iceman1001 3491157345 cppcheck fixes and other minor stuff 2022-01-03 22:17:40 +01:00
iceman1001 0a4c9f83ac fixes to hf iclass configcard mem setup, textual output, MIX->NG convertion 2022-01-03 22:08:55 +01:00
iceman1001 2551f9e0aa simplify 2022-01-01 11:29:47 +01:00
Philippe Teuwen 23b4a47e94 make style 2021-12-31 12:45:21 +01:00
iceman1001 e5b97dccf3 text 2021-12-31 11:19:30 +01:00
iceman1001 7e7c3e7fdf style 2021-12-31 09:25:04 +01:00
iceman1001 9c2b5118df hf mf gview now support user supplied password 2021-12-31 09:24:10 +01:00
Philippe Teuwen eb3c48cd25 make style 2021-12-30 12:41:23 +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
iceman1001 0d38da5de2 make style 2021-12-27 19:36:42 +01:00
iceman1001 4493114f4f renamed function and exported it 2021-12-27 17:43:28 +01:00
iceman1001 6653bdc2be zx adaptations 2021-12-27 17:42:33 +01:00
iceman1001 3491207890 text 2021-12-27 17:39:56 +01:00