Commit graph

308 commits

Author SHA1 Message Date
merlokk 87e183e664 small fix 2019-07-17 16:26:10 +03:00
merlokk 81fa3f20df speed optimization 2019-07-17 16:22:14 +03:00
merlokk 67ad6298cd added 14a send/receive arm timeout 2019-07-17 15:54:22 +03:00
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +02:00
Philippe Teuwen 3b12ba2e93 replace usb_poll_validate_length() by data_available() that supports USART too 2019-06-03 00:01:08 +02:00
iceman1001 58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
iceman1001 b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
iceman1001 33c10f260d chg: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff) 2019-05-23 10:29:33 -04:00
Philippe Teuwen 62b0732a8c
Merge pull request #201 from McEloff/hf_14a_sim_comp_write
fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command,
2019-05-23 00:42:12 +02:00
Philippe Teuwen 522297896c Use GetTickCountDelta everywhere 2019-05-23 00:39:50 +02:00
Eloff 0ec9323df0 PACK-response to EV1 PASSWORD request no more used as precompiled sequense 2019-05-23 01:30:23 +03:00
Eloff 49de1a1655 fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command,
chg: 'hf 14a sim' incoming commands length checks, reorder block conditions
2019-05-23 00:59:35 +03:00
iceman1001 088d34eb3e chg: hf mf nack - keep sync if started without card over antenna 2019-05-15 08:20:04 -04:00
iceman1001 bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001 41acc98d87 mix 2019-05-15 12:03:00 +02:00
Philippe Teuwen 107b3873fb fix 14a sniff timings by moving away debug msg 2019-05-09 15:24:41 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Iceman bdf7746105
Merge pull request #175 from McEloff/hf14a
'hf 14a sim' more flexible init responses method
2019-04-29 22:52:05 +02:00
Eloff b2d0bea05f 'hf 14a sim' more flexible init responses method 2019-04-26 13:22:57 +03:00
Philippe Teuwen eababdd3ef Merge branch 'master' into experimental_varlen
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 20:05:04 +02:00
Eloff 66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Eloff a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 e5928424b6 style 2019-04-16 15:08:51 +02:00
iceman1001 6803e6d1c0 style 2019-04-13 01:43:22 +02:00
Eloff 249352a1e7 'hf mf sim' + 'hf 14a sim' now back to stable 2019-04-09 23:57:10 +03:00
Eloff f13f7f4cbb Pull request #145. Next part of changes 2019-04-08 19:15:15 +03:00
McEloff 4588384587
Merge branch 'master' into temp 2019-04-08 10:26:30 +03:00
Philippe Teuwen 9c3a520300 iso14443a_select_card resp_data -> p_card 2019-04-07 12:18:20 +02:00
iceman1001 4856252912 styles 2019-04-07 11:39:49 +02:00
Philippe Teuwen a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +02:00
vratiskol 0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
Eloff 791ff18381 'hf mf sim' - bugs fix, refactoring 2019-04-05 00:15:55 +03:00
Eloff 19cf50a6ff Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support 2019-04-03 22:26:18 +03:00
vratiskol 1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
iceman1001 459835b5ca fix: 'hf mf sim' - Mifare simulation now works against Android etc. Thanks to @eloff 2019-03-27 15:29:45 +01:00
vratiskol 3b06c9d8ee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 20:46:56 +01:00
iceman1001 ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 e925dc9f7a clean 2019-03-17 21:53:26 +01:00
iceman1001 ca24b7ae74 chg: 'hf 14a sim' - send 4bit ACK/NACK responses 2019-03-17 21:52:14 +01:00
vratiskol cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim"
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
2019-03-15 21:45:00 +01:00