Commit graph

483 commits

Author SHA1 Message Date
Jonathan Liu d25f20fb10 hf mf sim: reduce 6ms threshold to 4ms for reset to idle
Fixes some readers not being able to detect the simulated card on
second Inventory command due to the RF field being powered off for
a short time before being turned on again to reset the card to idle
state.

Closes #1974
2023-05-24 15:23:37 +10:00
Davi Mikael 2d72bbd751
Merge branch 'RfidResearchGroup:master' into master 2023-05-05 16:22:31 -03:00
Jonathan Liu b1839d7318 hf mf sim: reduce 50ms threshold to 6ms for reset to idle
Fixes reader not being able to detect the simulated card on second
Inventory command due to the RF field being powered off for only 6ms
before being turned on again to reset the card to idle state.

Closes #1974
2023-05-05 12:19:11 +10:00
Davi Mikael 6950344567 Adjusting hf_msdsal standalone module 2023-04-19 01:39:18 -03:00
iceman1001 0b106665d4 MFU ev1 adaptations 2023-04-02 06:58:59 +02:00
George Talusan 002823dd9b
use Amiibo PACK if simulator PWD matches generated Amiibo PWD 2023-01-26 21:30:33 -05:00
iceman1001 a63257799a test of faster pack response for "hf mfu sim -t 7" 2022-12-13 21:47:25 +01:00
iceman1001 e18194028b style 2022-08-24 07:25:10 +02:00
iceman1001 834023b132 add a pwd to ntag215 sim if empty 2022-07-30 10:03:51 +02:00
iceman1001 edffa21598 fix cid 395490, and 14a simulation 2022-07-06 14:00:19 +02:00
iceman1001 56525cc453 style 2022-06-30 22:54:13 +02:00
kormax 8e8618c989 Replace rf reset with an s-block deselect when using 'hf 14a reader --ecp' 2022-06-16 22:31:32 +03:00
kormax 13e13b70f4 Improve 'hf 14a reader --ecp' fix performance 2022-06-16 09:04:21 +03:00
kormax 5ea305be28 Fix hf 14a reader --ecp to work consistently 2022-06-15 22:53:50 +03:00
iceman1001 10e7da9065 fix cid 393262 2022-05-31 22:30:06 +02:00
Philippe Teuwen 9880df8ca7 make style 2022-05-03 15:18:44 +02:00
iceman1001 799fa850ef twice atqa? 2022-04-30 20:55:41 +02:00
iceman1001 dc3944ab65 wrong crc 2022-04-30 20:48:45 +02:00
iceman1001 dd20083126 improved FUDAN identification and anti-collision select based on @lsylx issue #1599 2022-04-30 18:39:14 +02:00
iceman1001 247790b833 text 2022-03-31 23:33:20 +02:00
Philippe Teuwen 9849156f37 arm 14a/mifare: Fix codeql warnings 2022-02-27 14:54:11 +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
Philippe Teuwen a315254a88 style 2022-01-06 19:46:35 +01:00
iceman1001 e550f8ccc8 cppcheck fixes for const 2022-01-06 15:40:11 +01:00
Philippe Teuwen b703bb746b Adapting license headers, WIP 2022-01-06 02:20:38 +01:00
iceman1001 69ffcd3185 wrong byte in rats, and adapted two standalone modes 2021-12-25 16:13:42 +01:00
iceman1001 cbf06104bd different rats for DESFire simulation (suggestion from @mosci) 2021-12-25 13:46:00 +01:00
iceman1001 982e669a77 magsafe iterates 7a/7b/7c/7d for wupa 2021-10-23 20:45:46 +02:00
iceman1001 0e5e9163a1 added apple magsafe polling, thanks to @tcprst 2021-10-23 18:54:44 +02:00
Anze Jensterle b90359b26f
Made ECP delay 15ms
Found better results with 15 ms
2021-10-17 16:04:53 +02:00
iceman1001 37b89c7b11 add ehanced contactless polling to 14a reader/raw commands 2021-10-17 11:38:37 +02:00
Philippe Teuwen 88308ea727 typos 2021-10-10 01:35:45 +02:00
Philippe Teuwen 9f36ce1b9d cppcheck reduce variable scopes 2021-09-05 23:42:14 +02:00
Ray Lee 3d93a10ad0 fix bcc incorrect 2021-08-22 20:48:54 +08:00
Philippe Teuwen e79fb92074 Add fpga-xc3s100e and icopyx support 2021-08-21 23:45:46 +02:00
Philippe Teuwen 5b54385347 rename globals 2021-08-21 23:08:26 +02:00
iceman1001 a6712295c7 textual - hw status on device side 2021-05-11 16:11:33 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 ece1f555f5 style 2021-05-03 21:31:40 +02:00
iceman1001 aca5458344 old-style-declaration 2021-04-17 11:44:48 +02:00
iceman1001 0851f3d947 only 10bits available 2021-03-15 01:27:35 +01:00
Philippe Teuwen e5c5629cf2 Some tunings of otptear:
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
2021-03-07 23:48:55 +01:00
iceman1001 a7d3584176 even less dataavailable checks 2021-02-13 10:28:37 +01:00
iceman1001 1ce9053c51 hf 14a sim - less button checks and even less dataavailable checks 2021-02-12 22:08:10 +01:00
iceman1001 46d9ed20e5 added "hf jooki sim" command. Lets see if the data_available call every 8000th times doesnt interrupt with simulation process too much. 2021-02-12 10:16:24 +01:00
Philippe Teuwen b956d4c148 hf 14a config cliparser: use string values 2020-12-31 11:39:57 +01:00
tcprst a9f4f4f804
hf 14a config - now use cliparser 2020-12-30 22:42:46 -05:00
cyberpunk-re 5486bdd18c Added 'mf mfu sim t 7 n <numreads>' - MFU emulation now supports automatic exit after <num> blocks read. 2020-11-30 20:07:51 +00:00
iceman1001 93bdc9f75b hf mf sim - minor short times... 2020-11-29 00:16:22 +01:00
Philippe Teuwen 2f6261badb ReaderIso14443a: save/restore timeout 2020-11-13 22:34:04 +01:00
Philippe Teuwen a8b92f48a7 reorganize few global vars & fcts 2020-11-05 23:05:52 +01:00
iceman1001 7f6e3a7cfc textual 2020-11-05 12:02:54 +01:00
Philippe Teuwen f9452ee19a Group 14a sim response indexes in header 2020-11-03 02:32:41 +01:00
Philippe Teuwen c03daf233c Add support for 10b UID in hf 14a sim 2020-11-03 02:32:41 +01:00
Philippe Teuwen 777cb5a8ce make style 2020-11-02 01:46:47 +01:00
tcprst e44ae18d5c Create hf_tcprst standalone mode - IKEA Rothult 2020-11-01 23:58:44 +01:00
iceman1001 1902c36394 fix 2020-11-01 01:42:23 +01:00
iceman1001 5f411bdc3e miller decoding, in odd cases should return 2020-11-01 01:10:54 +01:00
Philippe Teuwen 1d018b9ccb hf 14a info: add msgs when forced RATS config 2020-10-30 09:23:22 +01:00
Philippe Teuwen 4ff8c44d85 Add warning if using 14a Transmit without setting HF field 2020-10-25 11:23:56 +01:00
iceman1001 d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
iceman1001 6e6c8cbd6b hf 14b raw - added tearoff 2020-10-13 16:09:17 +02:00
Philippe Teuwen a575827c99 add tearoff to hf 14a raw 2020-10-12 21:40:47 +02:00
Philippe Teuwen 55fa5e7c35 make style 2020-10-11 22:40:05 +02:00
iceman1001 f3a3a94fea hf 14a config - text / colours 2020-10-08 22:11:29 +02:00
iceman1001 ad20dcb30a 14a - less wake up wait 2020-10-05 10:03:19 +02:00
Philippe Teuwen 172f3163e6 update magic cards doc 2020-09-13 15:19:35 +02:00
Philippe Teuwen 812d9cc46a style 2020-09-12 00:31:17 +02:00
Philippe Teuwen 55e800e4ce text 2020-09-11 13:36:57 +02:00
iceman1001 420b29c7bf hf 14a sim t 10 - possibility to simulate IKEA rothult locks 2020-09-10 00:05:50 +02:00
Philippe Teuwen e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001 0be35a8e7e style 2020-09-07 10:35:09 +02:00
Philippe Teuwen 2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
Philippe Teuwen b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00
iceman1001 bd3047f316 less checks for dataavailable 2020-08-31 01:16:13 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 5ca50cf1b8 textual 2020-07-29 10:59:33 +02:00
iceman1001 3354f0d9d3 unified static dma buffer as bigbuf_malloc, less pressure on stack size 2020-07-15 15:16:35 +02:00
iceman1001 d6f65f8578 tosend into bigbuff 2020-07-13 18:14:34 +02:00
iceman1001 77aa5c6142 style 2020-07-13 12:20:35 +02:00
iceman1001 246144df2a amiboo default pack 2020-07-08 23:11:50 +02:00
iceman1001 8189809f48 chg: adapt to fpga changes 2020-07-02 12:38:38 +02:00
iceman1001 37359df25a textual 2020-06-21 18:14:30 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
iceman1001 88a42c6108 chg: ntag215/amiibo, empty header, use hardcoded values 2020-06-14 07:41:21 +02:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen b556810776 armsrc: clarify static vars vs global vars, part 2 2020-05-19 17:25:58 +02:00
Philippe Teuwen 3e7512a5d5 armsrc: clarify static vars vs global vars 2020-05-19 17:05:43 +02:00
iceman1001 ed11e4a093 cppcheck fix, assign a value 2020-05-14 09:18:51 +02:00
Philippe Teuwen 026707b960 arm: fix prototypes 2020-05-11 13:48:57 +02:00
Salvador Mendoza a06d05cc95 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza 88d9ad2829 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza 3535c2ffb0 Update iso14443a.c 2020-04-24 16:42:40 +02:00
iceman1001 732c012be7 adjustments 2020-04-10 10:27:28 +02:00
iceman1001 57788d5751 whitespace 2020-03-10 17:11:57 +01:00