Commit graph

3388 commits

Author SHA1 Message Date
Philippe Teuwen
51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen
2603c8d0d1 Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
  Astyle
  Verbose mode
  ReSync file
  Add Encrypted data test
  Mifare 10B UID
  cardAUTHKEY log
  Remove FLAG_RANDOM_NONCE
  Mifare Sim
  LogTrace
  Log Level
  Use Variable
  Add Variable for MAX_MIFARE_FRAME_SIZE
  Add Data Block debug
  Correct flags & test
  Correct return
  Revert "Merge branch 'master' into hf_mf_sim"
  Sync from Upstream
  Astyle update
  hf mf sim
2019-04-06 19:06:16 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen
98d9408746 make style 2019-04-06 00:52:55 +02:00
Philippe Teuwen
59d40068e2 style 2019-04-06 00:38:22 +02:00
vratiskol
2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen
366c1ec901 style 2019-04-06 00:07:48 +02:00
Philippe Teuwen
9ff5a4e2fa style 2019-04-05 23:17:16 +02:00
Philippe Teuwen
84753b91c0 fix %u <> size_t compilation warning 2019-04-05 21:12:32 +02:00
Philippe Teuwen
841f20c5e5 test_t55x7 logs & stats 2019-04-05 19:34:05 +02:00
iceman1001
fa0a2914f6 style 2019-04-05 19:29:16 +02:00
iceman1001
4be92f129a style 2019-04-05 19:13:03 +02:00
iceman1001
ffdfe09659 style 2019-04-05 18:57:05 +02:00
iceman1001
d42b779cbe style 2019-04-05 18:55:31 +02:00
iceman1001
e7406de219 redundant. 2019-04-05 18:53:17 +02:00
iceman1001
ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +02:00
iceman1001
82f4388abe style 2019-04-05 09:22:12 +02:00
iceman1001
6404c974b6 style 2019-04-05 09:20:37 +02:00
iceman1001
647dcc596f style 2019-04-05 09:18:52 +02:00
iceman1001
632e80e9b1 style 2019-04-05 09:16:01 +02:00
iceman1001
5b0eed26b5 style 2019-04-05 09:14:40 +02:00
iceman1001
774cbc5cb9 chg: 'script run test_t55x7' - better test loops 2019-04-05 08:58:12 +02:00
iceman1001
229452719a chg: compare with low case 2019-04-05 08:36:12 +02:00
iceman1001
a499e30608 chg: 'script run test_t55x7' - more modulations and better wipe card 2019-04-05 08:21:10 +02:00
iceman1001
1a565ae953 fix uninitialised 2019-04-05 07:39:07 +02:00
vratiskol
7f198192ec ReSync file 2019-04-05 04:09:20 +02:00
vratiskol
0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001
ad97aa3d29 chg: 'hf iclass sim' - void*, should be uin8_t* 2019-04-05 00:08:36 +02:00
iceman1001
4326d05674 clarify 2019-04-04 23:48:00 +02:00
iceman1001
444c12717c clarify 2019-04-04 23:45:58 +02:00
iceman1001
4d18b5a11c fix: compare unsigned 2019-04-04 22:36:45 +02:00
iceman1001
d127c2294c fix: compare unsigned 2019-04-04 22:35:38 +02:00
iceman1001
419eef5a43 fix: duplicate break 2019-04-04 22:22:31 +02:00
iceman1001
7a152dc383 fix: duplicate break 2019-04-04 22:11:30 +02:00
iceman1001
0dc0a96b3c fix: duplicate break 2019-04-04 22:10:46 +02:00
iceman1001
ff25fc700e fix: duplicate break 2019-04-04 22:09:43 +02:00
iceman1001
cd78a0878b fix: duplicate breaks 2019-04-04 22:08:23 +02:00
iceman1001
116837e9a0 chg: 'lf t55xx info' - text layout 2019-04-04 20:06:15 +02:00
iceman1001
436b026b27 ADD: 'script run test_t55x7' - a script to do regression test for t55xx programming / proxmark3 capability to read/demodulate different t55x7 configurations 2019-04-04 07:21:58 +02:00
vratiskol
6e8b3c29ba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 22:18:39 +02:00
iceman1001
38162917dc Add: new lua scripting support for some t55xx commands.
core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
2019-04-03 19:48:00 +02:00
iceman1001
c03e425550 chg: 'hf 15 restore' - fail message added 2019-04-03 15:42:42 +02:00
iceman1001
0383d7f052 chg: 'hf mf restore' - add finish message
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
2019-04-03 15:34:36 +02:00
vratiskol
1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen
8c74b2f9da Remove compilation warning, even if it was not real issue
cmdhflegic.c:269:13: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
2019-04-02 22:48:22 +02:00
Philippe Teuwen
cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen
5225722a50 t55xx info: fix q5 condition 2019-04-02 22:08:50 +02:00
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
2019-04-02 22:06:10 +02:00