Commit graph

1727 commits

Author SHA1 Message Date
Philippe Teuwen 79d7fb65b5 Merge branch 'master' into experimental_varlen
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
2019-04-24 00:59:57 +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
Philippe Teuwen b0eef756c1 return PM3_SUCCESS on usart_writebuffer_sync, usb_write 2019-04-22 23:03:01 +02:00
Eloff 8793a9e596 Merge commit 'e171010d' into hfmfu
# Conflicts:
#	CHANGELOG.md
2019-04-22 23:26:20 +03:00
Philippe Teuwen 127f5ed192 Revert c7a4d7af, remove redundant include 2019-04-22 22:11:57 +02:00
Philippe Teuwen 9602e641e2 Merge branch 'master' into experimental_varlen
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
2019-04-22 21:39:38 +02:00
Iceman e171010d32
Merge pull request #170 from McEloff/temp
'hf mf sim' full-byte anti-collision frame support
2019-04-22 19:14:34 +02:00
Philippe Teuwen f29facd15a Harmonize usb_write & usart_writebuffer_sync return values 2019-04-22 02:28:58 +02:00
Philippe Teuwen a9bb465271 reply_xx return val is int16_t, not bool 2019-04-22 02:10:31 +02:00
Philippe Teuwen eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen cdd4177968 usart_writebuffer_sync simplified as we're always sending in blocking mode anyway 2019-04-22 00:30:01 +02:00
Philippe Teuwen 81780e5c98 DbpStringEx using now reply_mix. hw status at 9600: from 26.5s to 7s 2019-04-21 23:58:53 +02:00
Philippe Teuwen a2e55be468 new format doc 2019-04-21 17:34:56 +02:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen 7ca1e98776 Protect SetAdcMuxFor with FPC 2019-04-20 11:17:14 +02:00
Philippe Teuwen e4006a7563 doc errors 2019-04-20 10:34:54 +02:00
Philippe Teuwen a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen a45238236d armsrc: put new frame parsing in common for usart (still usart_read_ng to do) 2019-04-20 01:47:50 +02:00
Philippe Teuwen 7331b7d6d2 Merge branch 'master' into experimental_varlen
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
2019-04-19 23:17:36 +02:00
Philippe Teuwen c7a4d7af3a Add ref to new mifaresim.h in standalone modes 2019-04-19 23:15:02 +02:00
Philippe Teuwen c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
iceman1001 a82fd7da34 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-19 10:00:09 +02:00
iceman1001 b495f4bc44 fix: Standalone/hf_colin now compiles 2019-04-19 09:59:34 +02:00
Iceman 05674dc559
Update readme.md 2019-04-19 09:29:50 +02:00
iceman1001 b29b07c8ad chg: hitag compile flag optional 2019-04-19 09:23:24 +02:00
iceman1001 9c776c8935 fix: standalonemode matty_run now compiles 2019-04-19 09:23:02 +02:00
Philippe Teuwen 9b4896225c SendCommandOLD for hf_young 2019-04-19 01:14:33 +02:00
Philippe Teuwen 8c89b35f1e style 2019-04-18 21:41:48 +02:00
Philippe Teuwen 9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Eloff 960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 15558070ad Fix receive_ng returned val test 2019-04-18 10:41:11 +02:00
Philippe Teuwen cb411ffab4 receive_ng in common/ 2019-04-18 00:50:31 +02:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen 64eb93c9c4 style 2019-04-17 22:08:10 +02:00
Philippe Teuwen 7cbcf8163c Merge branch 'master' into experimental_varlen
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
2019-04-17 22:06:39 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 1ee3679a98 style 2019-04-17 14:54:42 +02:00
Philippe Teuwen 8bfc5c1b47 New reply frames reception 2019-04-17 01:06:26 +02:00
Philippe Teuwen 96843c3f47 New reply frames transmission (reception still to be done) 2019-04-16 23:15:23 +02:00
Philippe Teuwen 4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff 63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
Philippe Teuwen 8b99df9074 Merge branch 'master' into experimental_varlen2
* master: (33 commits)
  unified Proxmark3 text
  removed
  more colors
  rearranged banner output and messages
  textual
  revert
  revert
  revert
  style spaces
  fix fake com port
  style
  style
  styles
  not null?
  style
  style
  style
  style
  style
  style
  ...
2019-04-16 20:58:58 +02:00
Philippe Teuwen 83571f02a0 style 2019-04-16 20:49:32 +02:00
Philippe Teuwen 44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
iceman1001 e04e2d6fa7 revert 2019-04-16 17:02:21 +02:00
iceman1001 597019b98a revert 2019-04-16 17:01:00 +02:00
iceman1001 64c7ee117e revert 2019-04-16 17:00:18 +02:00
iceman1001 aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
iceman1001 75524b72d1 style 2019-04-16 15:10:55 +02:00
iceman1001 144237abfd style 2019-04-16 15:09:57 +02:00
iceman1001 e5928424b6 style 2019-04-16 15:08:51 +02:00
iceman1001 00f3c281bb style 2019-04-16 15:06:14 +02:00
iceman1001 9a5b23428d style 2019-04-16 15:05:01 +02:00
iceman1001 ac7bd3532f style 2019-04-16 15:02:44 +02:00
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
Philippe Teuwen 04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen 9676d788e0 style 2019-04-14 13:37:53 +02:00
iceman1001 d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001 664434dfba Fix: USART calls rx/tx 2019-04-14 11:10:16 +02:00
iceman1001 e44fcb52d6 fix: usart needs those pins. (@ryan) 2019-04-14 11:07:35 +02:00
iceman1001 4ab2212346 style 2019-04-13 08:50:05 +02:00
iceman1001 6803e6d1c0 style 2019-04-13 01:43:22 +02:00
Eloff 15f2fb4010 duplicate method 2019-04-12 00:35:02 +03:00
Eloff 172748a82c BugFix.'mifaresim.c' used wrong Uart reference 2019-04-12 00:10:52 +03:00
osboxes.org ffd2c92584 style 2019-04-10 09:46:01 +02:00
osboxes.org 260ad9b7ae style 2019-04-10 09:32:55 +02:00
osboxes.org 05648163c1 style 2019-04-10 09:32:49 +02:00
osboxes.org 98b1172098 style 2019-04-10 09:32:40 +02:00
osboxes.org e8b75582be style 2019-04-10 09:32:07 +02:00
iceman1001 6c1b8f809e chg: update armside debug to fit with offical repo. 2019-04-10 08:42:00 +02:00
Eloff 249352a1e7 'hf mf sim' + 'hf 14a sim' now back to stable 2019-04-09 23:57:10 +03:00
iceman1001 8c4f8eaeca unused 2019-04-09 20:43:09 +02:00
iceman1001 9c634ce605 unused 2019-04-09 20:41:01 +02:00
iceman1001 4d99bf7fab unused 2019-04-09 20:39:38 +02:00
iceman1001 1c9507b6d8 unused 2019-04-09 20:37:35 +02:00
iceman1001 6bba17b1e7 unused 2019-04-09 20:36:06 +02:00
iceman1001 247245121c unused 2019-04-09 18:13:51 +02:00
iceman1001 5cc7f4eb86 unused 2019-04-09 18:10:24 +02:00
iceman1001 e6041f48ce unused 2019-04-09 18:07:47 +02:00
iceman1001 af54eb5138 unused 2019-04-09 18:06:19 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Iceman 9e1a84c7ab
Merge pull request #151 from McEloff/temp
'hf mf sim' nested authentication
2019-04-09 09:27:33 +02:00
vratiskol a2a1bbb7a1 Add message about debug message 2019-04-09 00:07:06 +02:00
vratiskol 1fc5fea623 Debug level => MF_DBG_EXTENDED
- Add comment
- Debug level MF_DBG_EXTENDED
2019-04-08 23:48:27 +02:00
Eloff f13f7f4cbb Pull request #145. Next part of changes 2019-04-08 19:15:15 +03:00
Iceman b0b996a67c
Merge pull request #145 from McEloff/temp
'hf mf sim' - bugs fix, refactoring
2019-04-08 14:18:06 +02:00
iceman1001 5585290981 fix: dereference 2019-04-08 11:40:52 +02:00
iceman1001 4b12b2cdf3 unshadow 2019-04-08 09:47:20 +02:00
iceman1001 1833ad5616 unshadow 2019-04-08 09:46:12 +02:00
McEloff 4588384587
Merge branch 'master' into temp 2019-04-08 10:26:30 +03:00
iceman1001 a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001 ef610f373a style 2019-04-07 16:21:27 +02:00
Philippe Teuwen 8c359921e9 keybytes for MifareUC_Auth 2019-04-07 12:30:49 +02:00
Philippe Teuwen 7485c5ed2e armsrc BitStream -> bits 2019-04-07 12:23:34 +02:00
Philippe Teuwen 9c3a520300 iso14443a_select_card resp_data -> p_card 2019-04-07 12:18:20 +02:00
iceman1001 6cc62b7985 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-07 12:11:08 +02:00
iceman1001 7eee2acfbf more crc overshadow 2019-04-07 12:10:52 +02:00
Philippe Teuwen a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001 c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001 91897f1f2e copy bytes 2019-04-07 12:06:48 +02:00
iceman1001 1e35130fbe missing include 2019-04-07 11:41:43 +02:00
iceman1001 4856252912 styles 2019-04-07 11:39:49 +02:00
iceman1001 49a0fda10b styles 2019-04-07 11:36:24 +02:00
iceman1001 c9b3dd32d1 remove random 2019-04-07 11:00:28 +02:00
iceman1001 ff74d56741 remove unused 2019-04-07 10:58:50 +02:00
iceman1001 593202867a remove include 2019-04-07 10:56:35 +02:00
iceman1001 3ab9dbe4c6 fix styles 2019-04-07 10:52:52 +02:00
iceman1001 8e6920cd95 fix styles and warnings 2019-04-07 10:40:59 +02:00
iceman1001 db78d26b9f styles 2019-04-07 10:33:34 +02:00
iceman1001 da7dc2353c style and warnings 2019-04-07 10:30:52 +02:00
iceman1001 aea6c6d3c5 fixes, shadow 2019-04-07 10:17:43 +02:00
Philippe Teuwen ebdfba033d arg names 2019-04-06 20:35:58 +02:00
Philippe Teuwen a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen a27d549a60 WritePageHitagS: why on earth page <> page_ 2019-04-06 19:48:20 +02:00
Philippe Teuwen 1b9914288d remove extern 2019-04-06 19:10:34 +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
iceman1001 127dc74674 chg: only english 2019-04-06 15:50:45 +02:00
Philippe Teuwen b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen 26eb54b965 style 2019-04-06 01:00:54 +02:00
vratiskol 567ceb017b Astyle 2019-04-06 00:39:27 +02:00
vratiskol 2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
vratiskol e24a0cfe17 Verbose mode 2019-04-06 00:32:11 +02:00
iceman1001 1773cfcf39 style 2019-04-05 18:51:19 +02:00
vratiskol bc11ff88ea Add Encrypted data test 2019-04-05 03:58:15 +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 07cc0d0a29 make style helped revealing my bug :) 2019-04-02 22:34:00 +02:00
Philippe Teuwen 64ce30c06c make style 2019-04-02 22:32:45 +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
Philippe Teuwen 7bd95dd5c3 FPC experiments: got so far TX_only, usart=115200 + usb=460800, see full commit msg
* Add \r\n to sent strings
* remove usart_init() from UsbPacketReceive cmd, it's already init in main.
* Add PLATFORM PM3RDV4FPC to ease dev
* TX: US_TCR is len of data to send, not len of buffer
* Use only one PDC bank as we're using it in sync
* Busy loop to wait for end of TX as we'using it in sync
* Change usart speed to 115200
* Don't downgrade USB speed, keep 460800
* Attempt to detect received data, fail so far
2019-04-02 01:06:03 +02:00
Philippe Teuwen 21b063da93 t55xx readblock: don't delay acquisition too much else we're sometimes off by one (observed when reading P1B1 on several cards) 2019-03-31 03:02:09 +02:00
Philippe Teuwen 4b00dd1053 lf write: leds 2019-03-31 01:14:20 +01:00
Philippe Teuwen 032062cfe9 Indala 64 on T55x7: use PSK1 2019-03-30 23:01:22 +01:00
vratiskol 4bef914653 Mifare 10B UID 2019-03-28 15:18:53 +01:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
vratiskol edfce24cad cardAUTHKEY log
Add key type as A or B
2019-03-28 00:37:48 +01:00
vratiskol 8f11fcc193 Remove FLAG_RANDOM_NONCE 2019-03-27 22:35:11 +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 a068f7c2bc Mifare Sim
Compilation OK
Emulation 1k OK with android
2019-03-27 14:18:26 +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 c939d99884 chg: remove LDC mod be default 2019-03-25 15:11:38 +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 c8a805c99c LogTrace 2019-03-19 17:09:16 +01:00
vratiskol 49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001 a41d6fbfb2 style 2019-03-19 10:26:52 +01:00
iceman1001 42bbf6a761 style 2019-03-19 10:26:36 +01:00
vratiskol c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001 433f84ca0d style 2019-03-18 22:25:21 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 aa28143e16 style 2019-03-18 20:16:04 +01:00
iceman1001 4706d27903 reassigned 2019-03-18 20:11:19 +01:00
iceman1001 0ed99ce0c4 unsigned variables cant be negative 2019-03-18 17:16:27 +01:00
iceman1001 03f89d2f3f chg: details 2019-03-18 13:44:51 +01:00
iceman1001 f24416a71e clean 2019-03-18 13:42:17 +01:00
iceman1001 dcec5627d1 chg: unsigned byte can't be less than zero. 2019-03-18 13:41:59 +01:00
vratiskol 86955c1de2 Log Level 2019-03-18 13:36:36 +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 619ef2ba37 Use Variable 2019-03-16 03:46:36 +01:00
vratiskol a3e0e90bf3 Add Variable for MAX_MIFARE_FRAME_SIZE 2019-03-16 03:01:03 +01:00
vratiskol 0a648e3807 Add Data Block debug 2019-03-16 01:25:10 +01:00
vratiskol ac575cf3ce Correct flags & test 2019-03-16 00:17:13 +01:00
vratiskol 77ebf1ddbf Correct return 2019-03-15 23:14:19 +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
vratiskol cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol 6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol b66152feb2 Astyle update 2019-03-15 21:07:15 +01:00
vratiskol 64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
iceman1001 248135682c mix in proxmark code.. 2019-03-15 00:40:29 +01:00
osboxes.org 9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001 5608df9771 chg: refactored away hitag logtrace. 2019-03-13 22:48:51 +01:00
iceman1001 b35ea2e352 chg: 'lf hitag writer' - refactored with timeouts etc.
chg: 'lf hitag'  test without toggle mode enabled
2019-03-13 16:44:32 +01:00
Philippe Teuwen a95ff04392 Fix mem leak in flash mem read 2019-03-13 12:46:03 +01:00
iceman1001 a117f06380 chg: refactoring of hitag (@piwi)
chg:  refactoring of hitagS (@iceman)
2019-03-13 12:18:37 +01:00
iceman1001 c01497b8af FIX: 'lf hitag' - init of TC0 missing (@piwi)
CHG: 'lf hitag' - factoring code (@iceman)
2019-03-13 10:16:12 +01:00
iceman1001 2563fa0472 moved some macro 2019-03-13 09:10:52 +01:00
Philippe Teuwen 92d94390ac MifareChkKeys_fast: fix always false cond 2019-03-13 00:30:11 +01:00
Philippe Teuwen 091ddb26f0 lfops fcAll: avoid division by zero 2019-03-13 00:27:03 +01:00
Philippe Teuwen d9308d912d fix: shifting signed 32-bit value by 31 bits is undefined behaviour 2019-03-13 00:07:40 +01:00
Philippe Teuwen 4aeff95259 T55xx_ChkPwds: fix always false cond 2019-03-12 23:53:39 +01:00
Philippe Teuwen 61905d2b19 lfops: add ledcontrol in API 2019-03-12 23:51:30 +01:00
Philippe Teuwen ebeab59bc4 lfops: remove always true conds 2019-03-12 23:50:43 +01:00
Philippe Teuwen 3807848171 fix DetectNACKbug: sync_cycles is signed 2019-03-12 23:37:53 +01:00
Philippe Teuwen fb07fd92f3 epa: check EPA_PACE_MSE_Set_AT return value 2019-03-12 23:14:19 +01:00
Philippe Teuwen 2c41a61ee3 remove always true cond 2019-03-12 22:52:15 +01:00
Philippe Teuwen d50de828a1 flash write: check first page write 2019-03-12 22:50:29 +01:00
Philippe Teuwen 049f41a22f iso15693: fix strncat usage (one must specify available room, not total dest buffer size) 2019-03-12 21:55:36 +01:00
Philippe Teuwen cdf0a56fad iso15693: check memcpy and fix BuildInventoryResponse
BuildInventoryResponse was copying 5 bytes instead of 12 bytes in the cmd buffer
2019-03-12 21:55:36 +01:00
iceman1001 1d63258388 add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125 2019-03-12 14:41:23 +01:00
iceman1001 35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen 346af6e3d1 make style 2019-03-11 23:12:31 +01:00
iceman1001 ea53e1f981 clean up 2019-03-11 19:31:18 +01:00
iceman1001 780424fe11 chg: hitag2, some clean up, also testing to remove relay_off, since its never relay_on anywhere. 2019-03-11 14:56:03 +01:00
Philippe Teuwen 119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
iceman1001 b26e60dae9 turn off fpc default 2019-03-10 14:40:41 +01:00
iceman1001 40ccdb0e73 clean up 2019-03-10 14:39:46 +01:00
Philippe Teuwen 7d25c72e40 Makefile: recompile arm only when needed 2019-03-10 12:55:17 +01:00
Philippe Teuwen 2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 8a7c6825b5 armsrc: fix mix of spaces & tabs 2019-03-09 20:34:41 +01:00
iceman1001 a819d522c1 textual 2019-03-09 11:51:46 +01:00
iceman1001 f4409ab375 chg: revert it 2019-03-09 11:51:18 +01:00
Philippe Teuwen 957464ca88 armsrc Standalone: fix mix of spaces & tabs 2019-03-09 11:19:45 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
Philippe Teuwen 4160e32b0a Replace isNoise by computeSignalProperties and removeSignalOffset 2019-03-08 19:06:55 +01:00
Philippe Teuwen 4ffeebc193 Fix return code check for iso14443b_select_card in hf epa 2019-03-05 16:39:26 +01:00
vratiskol 99dc51e005 Mem Leak 2019-02-24 22:02:09 +01:00
iceman1001 4ea05fc026 Fix: 'hf mf fchk' - now reports back correct found keys. 2019-02-17 15:56:45 +01:00
iceman1001 7934630d2b FIX: Makefile bad styled calls 2019-02-14 19:27:39 +01:00
merlokk 69f3e65dd0 fix memmove if len=0 2019-02-05 18:39:03 +02:00
merlokk 0e5d896893 fix endless loop 2019-02-05 18:27:48 +02:00
bogiton 75aeec6507
Add led blink on successful flash write 2019-02-04 17:44:29 +00:00
merlokk cf21f046d8 arm side 2019-01-30 18:15:47 +02:00
merlokk 1b3d96ab2d add apdu chaining to arm side 2019-01-29 19:30:15 +02:00
iceman1001 8991fa172d FIX: wrong define 2019-01-29 15:47:44 +01:00
iceman1001 730a7e8044 FIX: 'hf legic sim' - needed even more timeout.
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 13:48:53 +01:00
iceman1001 803aab7431 FIX: 'hf legic sim' - longer timeout for writes? (@drandreas)
see https://github.com/RfidResearchGroup/proxmark3/issues/83
2019-01-25 11:58:00 +01:00
iceman1001 0bec6038b7 CHG: adjusted compiling for older devices 2019-01-23 10:57:49 +01:00
iceman1001 20c3cd5ce3 chg: adjusting license according to earlier commits to pm3 offical repo. 2019-01-14 12:02:26 +01:00
iceman1001 a5833fe390 CHG: remove strange thr 0x43 in LF sampling
CHG: refactor cotag init
2019-01-12 12:10:31 +01:00
iceman1001 f215ebef80 Refactored 'lf t55xx brute', split it up into two commands.
- lf t55xx brute  (tries bruteforcing a range of pwds
- lf t55xx chk    (uses dictionary file or RDV4 flashmem)

FIX: adjust lf sim (@marshmellow42)  see 7008cf9c15
"attempt to speed up the loops waiting for carrier signal to go high or low
by only checking for a halt (button press or usbpol) every 256th loop
iteration. some users were experiencing modulating reactions to be too slow.

ADD: 'lf t55xx chk'
It uses @marshmellows42 idea behind commit  (6178b085a0)
With calculating a baseline (read block0 32times and average the signal-ish) and sampling only 1024 signal data. The algo then proceeds to calc the average and keep track of the candidate which is given the most difference in signal data average value.    I do some squaring and shifting for this.
The candidate is then send back to client to be tested properly with  trymodulation like before.

This seems to work good on t55xx card which has a ASK configuration.

WORK-IN-PROGRESS
2019-01-11 14:46:27 +01:00
iceman1001 8a514ea8f1 REM: remove unused files 2019-01-09 16:28:06 +01:00
iceman1001 e276bf1ce3 FIX: gcc8.1 warnings 2019-01-09 16:25:49 +01:00
iceman1001 6743e45386 CHG: name changes 2019-01-09 12:05:29 +01:00
iceman1001 2612cd006a CHG: bigbuf adaptations 2019-01-09 12:00:06 +01:00
iceman1001 3ae871f534 CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS - 2019-01-07 09:32:16 +01:00
iceman1001 c1237cfa26 FIX: 'lg pcf7931' - improved read code (@sguerrini97) 2019-01-06 21:05:29 +01:00
iceman1001 c37cc81c00 CHG: FeliCa more details 2019-01-06 20:42:51 +01:00
iceman1001 0dee369a58 FIX: 'hf tune' - now works... 2019-01-06 20:28:23 +01:00
iceman1001 38853b111f FIX: adding directives to reduce size on systems like Gentoo Hardned (see https://github.com/iceman1001/proxmark3/issues/268) 2019-01-05 20:59:00 +01:00
iceman1001 6e281a08ed CHG: 'hf mf fchk' - speed improvments by tweaking implementation.
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
2019-01-02 11:52:13 +01:00
iceman1001 0fb0c35308 CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device.
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
2019-01-01 18:01:40 +01:00
Chris f8c33af1da CHG: FPC connector tests. Device -> Client communications works.
Adjust  armsrc/Makefile   and client/Makefile  to include  the  -DWITH_FPC  flag to compile with FPC enabled.
2018-11-20 10:58:32 +01:00
Chris aa3b322d0f chg: 'analyze a' - some fpc test changes. 2018-11-16 23:59:14 +01:00
Chris faef1a0938 chg: lf simulation - trying the new clock for better timings. 2018-11-16 23:57:55 +01:00