RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5439 commits 3 branches 14 tags 86 MiB
Commit graph

3508 commits

Author SHA1 Message Date
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
iceman1001 4eff3521a7 Chg: 'lf t55xx info' - now prints if its a known config block 2019-04-02 10:33:25 +02:00
Philippe Teuwen d448549524 t55xx info: tag out of spec FSKa modulations in standard mode 2019-03-31 21:30:30 +02:00
Philippe Teuwen 045eda93e9 t55xx config: allow to toggle on/off i/q5/st 2019-03-31 19:42:36 +02:00
Philippe Teuwen e88fa75fd0 Revamped t55xx info: support offline block0, Q5, fix extended, add warns etc 2019-03-31 19:06:36 +02:00
Philippe Teuwen 43ca641939 Flasher: Avoid race condition when flasher finds the not yet closed pm3 port 2019-03-31 12:15:49 +02:00
Philippe Teuwen 2080dd396d t55xx detection: remove Atmel as it can be others, see t55xx trace for real manufacturer 2019-03-31 01:18:00 +01:00
Philippe Teuwen 720c410278 Fix lf t55xx trace: read the correct block 2019-03-31 01:13:59 +01:00
Philippe Teuwen 9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
Philippe Teuwen 2ebada74f0 makefile: fix race condition, now we can make -j8 :) 2019-03-27 23:14:19 +01:00
iceman1001 5fd98db92d fix: LF FDX-B demod - more lenient with max errors. Thanks to @maltehillmann 2019-03-27 15:35:43 +01:00
vratiskol a068f7c2bc Mifare Sim 
Compilation OK
Emulation 1k OK with android
 2019-03-27 14:18:26 +01:00
vratiskol ee2dfc0852 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-27 08:00:35 +01:00
vratiskol ffe4a0289f Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 22:28:20 +01:00
mazodude 15fdb07737 Start key file for Mifare Ultralight 2019-03-27 08:21:06 +11:00
iceman1001 069e73d025 preparing for more descramble patterns. 2019-03-26 21:13:57 +01:00
iceman1001 fb665ea7e3 chg: textual 2019-03-26 20:22:39 +01:00
iceman1001 34f4ee4902 whitespace 2019-03-26 20:22:12 +01:00
iceman1001 54e8eafa49 fix: 'lf t55xx chk' 
fix: 'lf t55xx brute'
fix: 'lf t55xx recoverpwd'
 - now works like they should again.
 2019-03-26 20:21:10 +01:00
iceman1001 834832be31 chg 'lf t55xx brute' - AquireData returns isnoise, but a pwd protected card signa looks like noise. 2019-03-26 16:23:19 +01:00
iceman1001 9133a9164f chg: 'lf t55xx chk' - refactored to use loadDictionary 2019-03-26 16:18:40 +01:00
vratiskol 60ac8b8934 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 10:08:49 +01:00
iceman1001 52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID. 
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
 2019-03-26 09:09:43 +01:00
vratiskol 04c14d1931 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 15:51:21 +01:00
iceman1001 68fc65a8c5 chg: 32bits binary strings used as default 2019-03-25 14:41:28 +01:00
iceman1001 6bc3ab1e44 chg: some pwd from forum 2019-03-25 14:39:49 +01:00
iceman1001 800bce865d fix: sprint_bin_break doesn't skip bits when newline printing 2019-03-25 14:39:09 +01:00
vratiskol cffb8cbca4 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 00:16:40 +01:00
Philippe Teuwen fe740fabfd cmdlfhid: comment unused struct 2019-03-25 00:04:28 +01:00
Philippe Teuwen 59cf25640f cmdhf14a: Fix usage of sizeof on a uint16_t array 2019-03-24 23:52:00 +01:00
Philippe Teuwen 7936626725 cmdanalyse: use byte arrays 2019-03-24 23:36:45 +01:00
vratiskol 0d5173739c Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-24 22:53:04 +01:00
Philippe Teuwen 9d1aa3fb96 fgpa_compress: dealloc responsibility to main and add missing one 2019-03-24 22:26:49 +01:00
Philippe Teuwen eb3f5e12eb Fix memleak in fpga_compress 2019-03-24 22:20:58 +01:00
Philippe Teuwen 19588b045f Fix realloc mistake: ptr nulled but not freed upon failure 2019-03-24 22:09:25 +01:00
iceman1001 44c3a0a8aa chg: 'lf keri demod' - added stopbits 2019-03-24 19:50:53 +01:00
iceman1001 08dc8ab695 debug 2019-03-23 19:09:37 +01:00
iceman1001 cfb11adeb8 simple check 2019-03-23 19:08:22 +01:00
iceman1001 55b8b8df82 fix: 'lf pyramid demod' - inverted 
chg: checksum colors
 2019-03-23 19:06:52 +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 e26677f841 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 14:45:08 +01:00
iceman1001 ffdd91cab6 add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this. 2019-03-21 12:53:05 +01:00
vratiskol f42dd2590e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 23:42:00 +01:00
iceman1001 b111b37eb6 offline access 2019-03-20 22:05:29 +01:00
iceman1001 2534d02000 text 2019-03-20 22:04:35 +01:00
vratiskol 28d7b99e1b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 15:59:11 +01:00
iceman1001 3c32fa9f38 color 2019-03-20 12:37:10 +01:00
vratiskol cb895fb8ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 21:15:54 +01:00
iceman1001 8e465d076c chg: use found clock is common 2019-03-19 17:53:42 +01:00
vratiskol 49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001 ab226c2864 detectST has better clock detection. Since 'data raw am' fails but 'data detect a' succeed in finding a clock. Lets see if anything else breaks because of this? 2019-03-19 10:20:10 +01:00
vratiskol 1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001 f79c0075c4 style 2019-03-19 00:12:46 +01:00
iceman1001 e3dbbd3271 style 2019-03-19 00:11:32 +01:00
iceman1001 fb9d34447e style 2019-03-18 23:59:35 +01:00
iceman1001 690400d145 style 2019-03-18 23:57:44 +01:00
iceman1001 b7b7840ae1 bool 2019-03-18 23:57:00 +01:00
iceman1001 b8c5faee92 style 2019-03-18 23:55:53 +01:00
iceman1001 2276779b01 style 2019-03-18 23:55:39 +01:00
vratiskol efa03a1e55 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 23:52:39 +01:00
iceman1001 122807148c style 2019-03-18 23:49:51 +01:00
iceman1001 26804cb85f style 2019-03-18 23:48:40 +01:00
iceman1001 fd198b0048 mem leaks 2019-03-18 23:46:26 +01:00
iceman1001 35592b979d unsigned long long 2019-03-18 23:43:44 +01:00
iceman1001 b57c2d5935 reverting.. 2019-03-18 23:31:04 +01:00
vratiskol 3c96440215 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:49:42 +01:00
iceman1001 7344d9128f style 2019-03-18 22:35:33 +01:00
iceman1001 e26e666734 style 2019-03-18 22:31:31 +01:00
iceman1001 93a91454f9 style and fixes 2019-03-18 22:30:13 +01:00
vratiskol c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001 17f5df152b style 2019-03-18 22:16:05 +01:00
iceman1001 b9cbc5cb7f bad logic 2019-03-18 22:14:07 +01:00
iceman1001 580159ed97 mem leak 2019-03-18 22:11:31 +01:00
iceman1001 4288e9db73 style 2019-03-18 22:04:53 +01:00
iceman1001 524ed17894 styles 2019-03-18 21:56:44 +01:00
iceman1001 38b24d94ba mem leaks 2019-03-18 21:53:57 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 910b5f31c2 null terminated 2019-03-18 21:49:15 +01:00