Commit graph

3587 commits

Author SHA1 Message Date
Philippe Teuwen cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
Philippe Teuwen 7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
osboxes.org e703dcb8ad style 2019-04-10 09:49:42 +02:00
osboxes.org 598d016477 style 2019-04-10 09:47:46 +02:00
osboxes.org acf3920394 style 2019-04-10 09:47:36 +02:00
osboxes.org ffd2c92584 style 2019-04-10 09:46:01 +02:00
osboxes.org ba45da1c28 style 2019-04-10 09:38:33 +02:00
osboxes.org 827cd721fe style 2019-04-10 09:37:46 +02:00
osboxes.org ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001 2b582c9bd0 unused 2019-04-10 09:00:38 +02:00
iceman1001 9c78f4d6d0 unused 2019-04-10 08:58:08 +02:00
iceman1001 84233a8f85 unused 2019-04-10 08:57:23 +02:00
iceman1001 0a43c80dff unused 2019-04-10 08:55:29 +02:00
iceman1001 d5dc1156e1 unused 2019-04-10 08:54:33 +02:00
iceman1001 1809d6c839 unused 2019-04-10 08:52:45 +02:00
Philippe Teuwen 6d0ee581fd ease hardnested_tables compilation, in case we figure out what to do with it some day 2019-04-09 22:50:04 +02:00
Philippe Teuwen 55ac61e145 remove redundant buffer init 2019-04-09 22:43:29 +02:00
Philippe Teuwen 28ca3e8c22 on prototypes, void means sth 2019-04-09 22:42:23 +02:00
iceman1001 9c74a96c9b unused 2019-04-09 21:40:25 +02:00
iceman1001 cf21db6f38 unused 2019-04-09 21:38:04 +02:00
iceman1001 c19b5977d4 unused 2019-04-09 21:36:52 +02:00
iceman1001 3f2d02b978 unused 2019-04-09 21:36:14 +02:00
Philippe Teuwen 2ebf940bf0 PrintAndLogEx: use const on char *fmt 2019-04-09 21:25:11 +02:00
Philippe Teuwen a561370f8d more strncpy fix 2019-04-09 20:15:08 +02:00
Philippe Teuwen df55154649 more 2019-04-09 20:08:35 +02:00
Philippe Teuwen 2f33682035 use sizeof 2019-04-09 20:05:27 +02:00
Philippe Teuwen ff194eb861 CmdHF15Write: make sure truncated string is null-terminated 2019-04-09 20:02:41 +02:00
Philippe Teuwen 258332894b hardnested: get rid of shift by negative value 2019-04-09 17:49:02 +02:00
iceman1001 87660df8f2 fix: 'hf mf hardnested' - not verify key when reading nonce file 2019-04-09 17:14:47 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Fl0-0 be90c76f47 Fix sizes for GCC 8.2 string truncation warnings 2019-04-09 09:45:06 +02:00
iceman1001 b0d627bae5 check returnvalue 2019-04-08 14:41:06 +02:00
iceman1001 678293913c ccc 2019-04-08 14:22:50 +02:00
iceman1001 726e02b900 color 2019-04-08 14:22:04 +02:00
iceman1001 98d8405830 wrong includes 2019-04-08 12:58:26 +02:00
iceman1001 493a26b93a updated 2019-04-08 12:47:34 +02:00
iceman1001 cd85c57e11 style 2019-04-08 12:38:32 +02:00
iceman1001 cfe793bd22 pointers 2019-04-08 12:29:49 +02:00
iceman1001 b7b7db8ca4 unshadow crc16 2019-04-08 10:45:55 +02:00
iceman1001 4843726d7e unshadow bs_ones, bs_zeros 2019-04-08 10:36:58 +02:00
iceman1001 0e05faaf0c styles 2019-04-08 10:33:06 +02:00
iceman1001 0b6dce3363 styles 2019-04-08 10:30:20 +02:00
iceman1001 29d73046cc unshadow clock, the mysterious one 2019-04-08 10:21:28 +02:00
iceman1001 2b3e5b7aac style 2019-04-08 10:19:01 +02:00
iceman1001 ebe98723d4 unshadow 2019-04-08 10:17:08 +02:00
iceman1001 21d88ae2c2 unshadow, multiple defines. 2019-04-08 10:16:57 +02:00
iceman1001 91e34643ab unshadow 2019-04-08 10:14:22 +02:00
iceman1001 7f0b1eacd1 unshadow 2019-04-08 10:13:15 +02:00
iceman1001 a1d9b574fd style 2019-04-08 10:11:57 +02:00
iceman1001 5e1c5f72e1 styles 2019-04-08 10:10:48 +02:00
iceman1001 dcb83d2962 styles 2019-04-08 10:01:57 +02:00
iceman1001 e1d56b5f94 unshadow 2019-04-08 09:50:06 +02:00
iceman1001 2fc54ca667 unshadow clock.. the mysterious variable 2019-04-08 09:42:27 +02:00
iceman1001 854536b155 unshadow 2019-04-08 09:39:05 +02:00
iceman1001 eadc980835 unshadow 2019-04-08 09:26:39 +02:00
iceman1001 55cbedc600 styles 2019-04-08 09:24:31 +02:00
iceman1001 21fd059dc2 unshadow 2019-04-08 09:08:03 +02:00
iceman1001 ec278e60cc unshadow 2019-04-08 08:34:40 +02:00
iceman1001 a2176b722d fix 2019-04-08 08:28:43 +02:00
iceman1001 1815376ef5 style 2019-04-08 08:26:30 +02:00
iceman1001 8f2983368c style 2019-04-08 08:26:18 +02:00
iceman1001 075ccebfd5 unshadow 2019-04-08 08:23:11 +02:00
iceman1001 9328a8efbb fix 2019-04-08 08:15:28 +02:00
iceman1001 8d2c02878b simpler branching 2019-04-08 08:11:18 +02:00
iceman1001 a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001 f6a80e0dc8 funcArgNamesDifferent 2019-04-07 20:34:42 +02:00
iceman1001 514611e885 fix 2019-04-07 20:24:13 +02:00
iceman1001 f1a01dcc7b fix 2019-04-07 20:22:24 +02:00
iceman1001 8aa5dec805 styles 2019-04-07 20:21:14 +02:00
iceman1001 e95955b793 shadowing 2019-04-07 20:17:59 +02:00
iceman1001 648706d691 shadowing 2019-04-07 20:13:30 +02:00
iceman1001 f27d618a08 shadowing 2019-04-07 20:12:24 +02:00
iceman1001 b37981df74 shadow 2019-04-07 20:08:53 +02:00
iceman1001 c4d88c239b style 2019-04-07 19:21:24 +02:00
iceman1001 b6345a5df7 style 2019-04-07 18:44:15 +02:00
iceman1001 98d24a4fe8 style 2019-04-07 18:42:47 +02:00
iceman1001 c881acd631 more 2019-04-07 18:35:01 +02:00
iceman1001 4c4471331b fix 2019-04-07 18:32:03 +02:00
iceman1001 27003904ce printandlogs.. 2019-04-07 18:12:58 +02:00
iceman1001 8d9bd81020 never used assignments 2019-04-07 16:49:22 +02:00
iceman1001 9eba3a849a shadowing 2019-04-07 16:34:21 +02:00
iceman1001 03b44b324b assign 2019-04-07 16:30:02 +02:00
iceman1001 0ffe2a4700 shadowing 2019-04-07 16:25:19 +02:00
iceman1001 c65d782d73 shadowing 2019-04-07 16:23:07 +02:00
iceman1001 7bf24a170f style 2019-04-07 15:22:01 +02:00
iceman1001 d8f539c217 style 2019-04-07 15:20:27 +02:00
iceman1001 0b455607a9 fsize can't be zero 2019-04-07 12:41:29 +02:00
iceman1001 69ba2d6a5b rename variables in order to prevent a popular usbcommand named as c. 2019-04-07 12:33:33 +02:00
iceman1001 a7dea8f1e7 overshadowed buf. 2019-04-07 12:30:25 +02:00
iceman1001 1273971991 more crc 2019-04-07 12:14:16 +02:00
iceman1001 8003d95be9 crc 2019-04-07 12:13:05 +02:00
Philippe Teuwen b787ccf150 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
* 'master' of github.com:RfidResearchGroup/proxmark3:
  more crc overshadow
2019-04-07 12:11:07 +02:00
Philippe Teuwen a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001 a8ad793f7f more crc overshadow 2019-04-07 12:10:04 +02:00
iceman1001 c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001 7a24d7fdb6 chg: 'lf indala demod' - texual 2019-04-07 08:52:10 +02:00
Philippe Teuwen 24acbf86eb arg names 2019-04-06 22:15:57 +02:00
Philippe Teuwen 7259a27f05 Change printT55xxBlock API 2019-04-06 22:04:02 +02:00
Philippe Teuwen 50e131f99b arg names 2019-04-06 21:59:34 +02:00
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
iceman1001 4c007beefd textual 2019-04-02 10:36:32 +02:00