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
17461 commits 3 branches 14 tags 86 MiB
Commit graph

941 commits

Author SHA1 Message Date
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +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 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +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 b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00
Philippe Teuwen 9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen cb411ffab4 receive_ng in common/ 2019-04-18 00:50:31 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +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
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 7bc3bea230 style 2019-04-16 15:32:37 +02:00
iceman1001 e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001 87a74e98b8 style 2019-04-16 15:19:53 +02:00
Philippe Teuwen 34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
Philippe Teuwen e0b7f22db1 Comment debug msg 2019-04-14 18:45:53 +02:00
Philippe Teuwen 3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen 85f67006e4 Remove redundant define 2019-04-14 14:35:42 +02:00
iceman1001 d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001 b50fe594da chg: moved include.. 2019-04-14 11:17:59 +02:00
iceman1001 fc0a62de18 Fix: USART - better RX/TX with one dma bank and wait loops (@ryan) 2019-04-14 11:08:44 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001 4ab2212346 style 2019-04-13 08:50:05 +02:00
Philippe Teuwen 4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen 35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen c10e47f8a9 More void, fixing "function declaration is not a prototype" [-Wstrict-prototypes] 2019-04-10 10:35:03 +02:00
osboxes.org ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001 39827a6d5d unused 2019-04-09 21:35:06 +02:00
iceman1001 28021ec17b chg: optimizations for ask/bi. 2019-04-09 16:23:55 +02:00
iceman1001 ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
iceman1001 daa7313095 unshadow 2019-04-08 08:36:07 +02:00
iceman1001 5ea649e59d style 2019-04-07 15:18:02 +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 a78af2bb06 rename crc -> crc_ctx. triggers overshadowing 2019-04-07 11:51:12 +02:00
iceman1001 ff74d56741 remove unused 2019-04-07 10:58:50 +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 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 2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen 682f23440d style 2019-04-06 00:23:01 +02:00
Philippe Teuwen 38f6fd037f style 2019-04-06 00:14:07 +02:00
Philippe Teuwen 404e92a0b1 utf8 Chinese... we might just translate it appropriately... 2019-04-05 22:37:41 +02:00
iceman1001 8c017157d4 chg: better strong wave detection for biphase 2019-04-05 20:28:58 +02:00
vratiskol 0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001 287a9dd204 chg: 'data raw nr' - cleanup 2019-04-04 23:42:02 +02:00
iceman1001 463661869a clean uo 2019-04-04 23:32:47 +02:00
iceman1001 2fa31d33fc style 2019-04-04 07:23:18 +02: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 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 dae6eefa52 FPC experiments: use oversampling, tested FPC at 460800 ^^ 2019-04-02 01:20:02 +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 db4aa08b78 make style 2019-03-28 14:19:41 +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 8ce361202c style - unused 2019-03-25 15:03:22 +01:00
iceman1001 962e58b475 style 2019-03-25 14:59:01 +01:00
iceman1001 bc5c07e550 style 2019-03-25 14:57:10 +01:00
iceman1001 43902c7c46 style 2019-03-25 14:52:57 +01:00
iceman1001 a820d59368 chg: one more step to unified debug printing clientside 2019-03-25 14:40:29 +01:00
iceman1001 8fb0999e05 fix: 'data detect p' - removed bad clock detection, failed to set all other parameters. 2019-03-25 14:03:36 +01:00
vratiskol cffb8cbca4 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 00:16:40 +01:00
Philippe Teuwen ca68ac108b wiegand: missing ; 2019-03-24 23:19:36 +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 f42dd2590e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 23:42:00 +01:00
iceman1001 1a871c040f only 10 clocks.. 2019-03-20 22:10:34 +01:00
vratiskol cb895fb8ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 21:15:54 +01:00
iceman1001 1650889d25 chg: also detect RF/100 2019-03-19 17:53:58 +01:00
vratiskol 49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001 54a1d576ee fix: better ASK strong /clipped clock detection. 2019-03-19 14:41:57 +01:00
vratiskol 1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001 8b8b67ac76 style 2019-03-19 00:07:57 +01:00
vratiskol c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001 af8e81d0a0 bool as bitwise 2019-03-18 22:07:44 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 28b074106d style 2019-03-18 20:34:24 +01:00
iceman1001 027cda47d2 chg: adjust ask demod 2019-03-18 13:40:51 +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 64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
Philippe Teuwen f1a0e57f65 binarraytohex: handle Manchester wrong bit markers 2019-03-15 00:09:40 +01:00
Philippe Teuwen f7b0c5e6d6 fix manrawdecode last bit missing 2019-03-14 13:19:16 +01:00
iceman1001 2c44136913 chG: 'trace list hitag' - started to unify hitag2/S annotation 2019-03-13 23:05:45 +01:00
iceman1001 e4912b1813 CHG: adapt noice threshold, my hitag has an amplitude of 11... 2019-03-13 12:38:07 +01:00
Philippe Teuwen c147b434a2 iso15693tools: fix buffer overflow 2019-03-12 22:06:37 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen 119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
Philippe Teuwen 21e6f2d861 jansson, tinycbor, mbedtls: avoid recompilations if not needed 2019-03-10 11:42:38 +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 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen 23f1a253a7 common: fix mix of spaces & tabs 2019-03-09 19:19:50 +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 1f0c1dff5e Fix issue #118 for better FSK on saturated signals 2019-03-07 21:13:58 +01:00
Philippe Teuwen 2e884db100 Add missing i2c init in sc upgrade 2019-03-05 19:44:02 +01:00
merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
 2019-03-01 19:37:43 +02:00
iceman1001 7945b5a805 colors 2019-02-25 00:15:39 +01:00
vratiskol 898f2bea5b Crapto Clean Up 
Clean up comment code
 2019-02-24 22:02:17 +01:00
iceman1001 a07dcf7924 chg: 'lf keri clone' - correct config block (use extended modes bit rates) 2019-02-24 10:25:53 +01:00
merlokk c5a1b06f25 mad comment fix 2019-02-22 16:58:49 +02:00
merlokk 0632918a47 fix MAD crc calculation (was wrong) 2019-02-21 20:07:17 +02:00
iceman1001 99b6087b01 chg: use calloc 2019-01-30 21:16:20 +01:00
iceman1001 34be8b4d37 CHG: wrong iso7816 (@piwi) 2019-01-29 15:23:07 +01:00
iceman1001 adffe29855 chg: adjusting license accoring match its .c file 2019-01-14 12:06:05 +01:00
merlokk 170cf7c67a inc timeout of card's response 2019-01-10 17:06:59 +02:00
iceman1001 2d5d8c130d chg: 'hf list 14a' - another 7bit command 0x35 2019-01-08 02:22:41 +01:00
iceman1001 806e5909a7 ADD: 'hf felica list' - updated annotation. 2019-01-06 19:41:29 +01:00
iceman1001 d4b32f3050 ADD: Sim module firmware upgrade file. v3.10 2018-12-19 23:28:01 +01:00
merlokk 85729d55e7 added arm side 2018-12-17 23:48:30 +02:00
iceman1001 c948911f71 chg... 2018-11-29 23:37:05 +01:00
iceman1001 2accb7d3f4 CHG: remove different clocks calls. 2018-11-29 23:32:59 +01:00
iceman1001 0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +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 e4cb74fedb chg: i2c comms, first try to recover i2c hangs. 2018-11-14 15:07:04 +01:00
merlokk 65923701f3 delete old files 2018-11-14 11:44:33 +02:00
merlokk 7214c70720 fido commands hash checks works. 2018-11-13 19:02:02 +02:00
merlokk 6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
Chris c75c0e4e52 chg: cleaning up in lfdemod.c, currently the ASK clock, demod of strong and weak signals 2018-11-07 12:21:57 +01:00
Chris b9676e6c93 chg: use signal mean instead of hardcoded FSK_PSK_THRESHOLD 
chg: stricter clock identification
chg: askclock detection, trying to find a better starting point
 2018-11-02 18:38:06 +01:00
indigowor2 f29c94954f merge 2018-10-31 17:39:32 +00:00
merlokk 8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk 61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
Chris 97c0729289 fix: 'sc raw t' - tlv decoding work again 
chg: 'sc brute' - now decodes TLV by default the found SFI
chg: 'sc raw' - better detection on armside when failing
 2018-09-25 02:54:51 +02:00
Chris dc67b5d7c9 chg: revert fpga_major mode in LF. 
chg: 'lf t55xx deviceconfig'  - persistence to flashmem is now option with param P
 2018-09-23 05:29:55 +02:00
Chris d42b4f6ddf CHG: ask clean wave - better start position in signal 2018-09-09 23:02:41 +02:00
Chris c187774a98 fix: hilow fuzzing overlap 2018-09-09 22:08:32 +02:00
Chris bc0ffa9e51 fix: remove zeromean 
chg: cleanup
 2018-09-09 19:54:22 +02:00
Chris d774e4c84f Chg: step2 in the signed vis unsigned graphbuffer signal processing. 
It will break some tone-based demods like ti etc.
 2018-09-09 12:34:43 +02:00
Chris 4e42d11d15 FIX: HI/LOW fuzz levels. (one step for ASK/NZR etc) 2018-09-08 20:54:54 +02:00
Chris e29bb51e76 chg;: idea of auto adjusting signal to zero mean baseline in order to compensate different antennas 2018-09-07 23:47:42 +02:00
Chris 3a338f566e chg: zero mean in hidfskdemod 
chg: idteck demod return values
 2018-09-06 21:44:53 +02:00
Chris 24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
Chris 8b047ae9f5 cleanup 2018-09-05 19:13:39 +02:00
Chris 605d7a2343 FIX: just noice detection on device / client 2018-09-05 19:07:31 +02:00
Chris ff16cbb4db FIX: USB Device descriptor issue, (@micolous, @megabug) 
https://github.com/iceman1001/proxmark3/pull/243
1be25f9125
 2018-09-03 19:04:53 +02:00
Chris 854bfc8595 FIX: two coverty scan bugs. 2018-08-18 15:22:59 +02:00
Chris 5f77121694 initial commit to be in sync the-soon-defunct repo pm3rdv40. 2018-08-12 21:54:31 +02:00
Chris bacf8aff0f add: FPC connector skeleton usart. Not working but if will be a starting point for those who might want to help out with it. 2018-07-30 09:54:44 +02:00
iceman1001 4d8488e14b CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi) 
CHG: textual adjustments
 2018-07-28 14:25:12 +02:00
Chris 4a8e048694 chg: 'sc raw' added 't' param, for decoding apdu response 
chg: i2c,  max timeout fitting for 256bytes frames
 2018-07-09 13:15:28 +02:00
Chris 684a692bb0 chg: i2c clean up 2018-07-09 12:10:21 +02:00
Chris 2102b19d11 add: 'sc setclock' 0,1,2, allowed setting sim clocks.. 2018-07-09 11:51:19 +02:00
Chris 714de99f82 chg: i2c fixes. all working. 
chg: 'sc info'  now prints url to atr decoder.
chg: 'sc reader' has more options  A, S
 2018-07-09 11:22:51 +02:00
Chris 0d8e3160f8 chg: i2c - adjustments 2018-07-08 21:55:50 +02:00
Chris da52b71135 chg: i2c more debugs 2018-07-08 20:01:34 +02:00
Chris df4c0014f6 chg: i2c fixes 2018-07-08 13:52:30 +02:00
Chris d4e471092f chg: i2c 'firmware version prints correct' 2018-07-08 12:33:42 +02:00
Chris b49eea5637 chg: 'sc raw' -i2c correct lenght? 
chg: 'sc upgrade' - warning message
chg: 'sc reader' - print right amount of bytes
 2018-07-08 12:03:35 +02:00
Chris ef318b56ec chg: i2c - don't mix different communications layers when reporting data back 2018-07-08 10:50:05 +02:00
Chris ba1ccf1994 fix: i2c - stop() fix to wait for SCL to go HIGH (@olaf) 2018-07-08 09:18:08 +02:00
Chris defc7d9070 chg: i2c increased some wait and better flow. 2018-07-07 12:42:33 +02:00
Chris e77c4528d5 chg: i2c - added tracelogging 
chg: i2c - new approach to GETATR
 2018-07-06 20:14:55 +02:00
Chris bfaf989eaa chg: i2c read.. add some extra time while SCL HIGH 2018-07-06 18:30:01 +02:00
Chris c6eb251bfb chg: i2c.. swapped 2018-07-06 17:28:26 +02:00
Chris bda57d3818 chg:i2c... 2018-07-06 17:20:02 +02:00
Chris aef053879c chg: i2c timings. 2018-07-06 17:10:49 +02:00
Chris a5d1ec0b22 chg:'i2c' timeouts.. 2018-07-06 16:01:23 +02:00
Chris 5dbebb3dc8 chg: sc reader - get atr 2018-07-06 15:20:21 +02:00
Chris bcffde1198 chg: smartcard - wait until SCL goes high 2018-07-06 11:16:46 +02:00
Chris fff2f51cfb chg: testing to switch from WaitXX calls to SpinDelay, they seem to mess up 2018-07-06 09:10:13 +02:00
Chris 79158c7360 chg; preparing for more cmds. 2018-07-06 00:24:04 +02:00
Chris 36d774506c chg: 'sm raw' - implemented 'r' don't read reply 2018-07-05 21:10:21 +02:00
Chris 2c4a528db2 chg: smartcard - code adjustments 2018-07-05 20:30:30 +02:00
Chris fca841122f chg: 'sc reader' - hooked up atr. 2018-07-05 16:32:10 +02:00
Chris ee006c6a7b add: sc upgrade - beta test 2018-07-05 14:38:31 +02:00
Chris 44e300930f fix: sc upg 2018-07-05 11:22:43 +02:00
Chris f70b8be5de add: 'sc' - smart card commad [rdv40] 
chg: test to read out firmware
 2018-07-05 10:48:24 +02:00
Chris 3ecff83de2 chg: clean up 2018-07-04 15:29:27 +02:00
Chris e09f9cbb32 add: RDV40 smart card module comms ( Thanks to @Willok! ) bitbanging i2c with it 2018-07-04 12:19:04 +02:00
Chris 35b7989b1c chg: OR in values. 2018-07-02 18:54:12 +02:00
Chris 17d406be1c chg: arm-none-eabi adaptations to macro 2018-06-30 19:02:59 +02:00
Chris 7bc8cd66cf chg: iclass output 2018-06-30 18:34:33 +02:00
iceman1001 c15e755e5f add: base64 support 2018-05-23 10:37:11 +02:00
iceman1001 2e6699273e chg: cleanup from offical repo 2018-04-18 20:17:00 +02:00
iceman1001 e56b8f3bda ophs.. 2018-04-03 10:02:54 +02:00
iceman1001 4b2a746ef5 ADD: 'hf mfu' detection of Mifare Ultralight NANO tags. 
Interesting tag with two new commands.  LOCK_SIG  / WRITE_SIG.   Need to add support for it.
https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf
 2018-04-03 09:57:20 +02:00
iceman1001 11057f5806 chg: commented out some unused if-statements 2018-02-18 10:37:53 +01:00
iceman1001 ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001 554af51a54 fix: osx complains on sprintf 2018-02-01 17:37:05 +01:00
iceman1001 52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001 bcf6fcd193 fix: 'crc iclass' doesn't need byteswapping 2018-02-01 09:33:34 +01:00
iceman1001 e66b9c52b3 chg: some referense to "string.h" -> which should be <string.h> or removed. 2018-01-31 12:04:12 +01:00
iceman1001 bf25b1c9ba chg: crc16 got a compute_crc function 2018-01-30 03:31:11 +01:00
iceman1001 50743b7e88 rem: 'hf iclass' blocknum LUT is gone. Removed also functionality for it. 2018-01-29 16:44:49 +01:00
iceman1001 848decd711 rem: 'hf 15' - removed old bit-looped crc implementation 2018-01-29 16:36:59 +01:00
iceman1001 cbe313a569 chg: iClass crc is byteswap 2018-01-29 16:36:07 +01:00
iceman1001 095b3af43b CHG: 'hf 15' - swapped crc impl to table based. 2018-01-29 15:55:56 +01:00
iceman1001 c04ac4f9ac ADD: 'hf felica reader' - added pm3 as FeliCa reader 
ADD:  raw commands -  added the basis for sending RAW commands to FeliCa.
CHG: CRC16 rework,  uses table based implementation.  This will change more functions as I go on.
 2018-01-29 13:42:02 +01:00
iceman1001 51a65a0ce3 rem: removed unneeded function 2018-01-28 12:47:08 +01:00
iceman1001 0c827e755f chg: parameter adjustments 2018-01-28 12:42:17 +01:00
iceman1001 205e4b2300 chg: adjusted the input parameters for crc16 implementations. 2018-01-28 12:19:04 +01:00
iceman1001 1f5477491f chg: rename 2018-01-28 11:01:29 +01:00
iceman1001 e5804645f1 chg: most of the crc16 works. 
ISO14443 crc A  = crc16_a
ISO14443 crc B  = ...
ISO15693 crc    = crc16_x25
 2018-01-28 10:59:57 +01:00
iceman1001 e396575424 add: fast reverse 16bit 2018-01-27 23:16:35 +01:00
iceman1001 3943f87c30 chg 2018-01-18 16:31:07 +01:00
iceman1001 e18c360010 ADD: Calypso protocol commands 2018-01-18 16:26:56 +01:00
iceman1001 93ecfddb88 CHG: iso15 from b8f35947f2 @lnv42 2018-01-16 21:07:58 +01:00
iceman1001 5ea8f73547 FIX: cmd_send has wrong varible definitions, leading to loss of values. 2018-01-11 21:47:27 +01:00
iceman1001 398ca555b2 moved into common/polarssl 2018-01-02 11:17:59 +01:00
iceman1001 e67daf946d chg: added the config.. 2017-12-24 10:50:00 +01:00
iceman1001 a3ec7fd21f chg: 'hf emv' changes from @merlokk EMV4 commit 2017-12-24 10:26:47 +01:00
iceman1001 07ab8ea674 moved into here. 2017-12-24 10:23:55 +01:00
iceman1001 85f3870233 chg: removed old WITH_EMV , HAS_512_FLASH, defines, since emv now is native in client and we have automatic detection of 512kb size when compiling. 2017-12-24 10:23:04 +01:00
iceman1001 3e5bd575f6 syntax sugar 2017-12-24 10:22:02 +01:00
iceman1001 5d55807f37 add: cryptolibs needed in emv, 
moved aes, des into here.
 2017-12-24 10:21:28 +01:00
iceman1001 74b4755d42 moved function 2017-12-23 11:23:14 +01:00
iceman1001 5eafdbf872 ADD: 'hf iclass check' - increased speed in check keys with new algo. 
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
 2017-12-21 10:13:40 +01:00
iceman1001 44280abf62 chg: reverting back to more or less offical pm3 version. 2017-12-07 15:02:15 +01:00
iceman1001 1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001 bc8b3534fe chg: renaming 2017-11-09 19:30:29 +01:00
iceman1001 30ceea4aea chg: cleaning up some function calls. 
fix: check to see clock is bigger than zero.
 2017-11-09 19:15:56 +01:00
iceman1001 609008b3ad chg: removed unneeded loop 2017-11-06 15:28:44 +01:00
iceman1001 881c7115a7 CHG: centralized the LF signal properties LOW/HIGH/MEAN/AMPLITUDE/ISNOISE into one struct. 
CHG: 'data raw ar'  - didn't take in consideration the command line parameter CLOCK.
 2017-11-06 15:06:42 +01:00
iceman1001 3b1c01cd13 CHG: 'lf search' - hitag/cotag wrong return values 
CHG: is_justnoise - safety checks
CHG: 'hitag reader' - debug printing
 2017-10-30 22:20:08 +01:00
iceman1001 54e8a0ae2b change demod printing 2017-10-30 20:33:11 +01:00
iceman1001 db56ca11a3 FIX: detect noise signal by measuring amplitude of signal. 2017-10-30 19:18:30 +01:00
iceman1001 6f948be842 CHG: some average / mean functions to enhance justNoise functions. 
FIX: 'lf t55xx' - verifying that collected signal is not just noise..
 2017-10-30 16:44:04 +01:00
iceman1001 b5842e8c1b fix: usb_cdc don't report that pm3 device is selfpowered.. (since its not by default) 2017-10-29 19:28:23 +01:00
iceman1001 5da60668dc chg: Serialnumber is shorter. Will be better for OSX ppl 2017-10-21 13:07:07 +02:00
iceman1001 4b63f940f1 CHG: FeliCa implemenation by @satsuoni 2017-10-20 20:27:44 +02:00
iceman1001 53333f22c8 fix: hw status (and USB comm in general) PR #434 : (@pwpiwi) 2017-10-20 16:32:42 +02:00
iceman1001 094f3dea0b FIX: Found the little bugger which has been haunting me for sometime now. 
Maybe I can test my other new things?...
 2017-10-20 15:17:03 +02:00
iceman1001 f8c0202403 CHG: reverting to official PM3 style cdc_acm 
CHG:  Commented out OSprop and CompatIDFeatureDescriptor to fix compiler errors (@ceres-c)
 2017-10-20 14:45:48 +02:00
iceman1001 b739076d99 FIX: reverted back to offical pm3 - waiting for flags to be cleared & set. 2017-10-19 14:03:45 +02:00
iceman1001 3b665be5fc chg: usb_cdc, it should be similar to official pm3. lets 2017-10-19 13:06:47 +02:00
iceman1001 1f0a1edfbe CHG: restored the wait in flash-mode. Its waiting for the device to "reboot".. 
CHG: usb_Cdc,   :  usb specs say 100ms delay. Previous delay was much longer...
 2017-10-17 23:09:32 +02:00
iceman1001 16028f7d33 CHG: appmain now calls cmd_recieve as it should 
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
 2017-10-17 20:58:17 +02:00
iceman1001 e47114bd65 FIX: MS feature descriptors now work when attaching device on Windows 8, 10 
However:   there are some registry entries needed to be deleted when the device is NOT connected.
I'd created some batch files to run as administrator,  which deletes and queries the registry.
 2017-10-13 10:39:33 +02:00
iceman1001 1d5e3fc217 fix: usb communications should be fine again. Inteface size must be 0x08, not 0x40 2017-10-12 15:13:18 +02:00
iceman1001 1cca109429 chg: validating we got a full usbcommand (512b) 2017-10-11 12:48:04 +02:00
iceman1001 480c0d0ba0 CHG: pm3 device will be identified on win10 automatic without drivers. Sadly no com port... 2017-10-11 12:46:38 +02:00
iceman1001 6cebcb4b0a CHG: replaced with a define 2017-10-11 10:17:01 +02:00
iceman1001 c9f37223ce FIX: at91sam7s256 has some limits on endpoints maxpacket sizes. Took me sometime to find it. 2017-10-11 10:15:41 +02:00
iceman1001 f788ef51d1 CHG: fiddling with USB_CDC and device identification on Windows. Still dodgy. This most likely will force you to JTAG update your device. *experimental warning* 2017-10-10 15:06:17 +02:00
iceman1001 e32cd18fd3 ADD: 'hf list felica' to be able to annotate Felica 2017-10-10 15:05:06 +02:00
iceman1001 3a0b205b7f chg: some extern 2017-10-10 15:03:33 +02:00
iceman1001 d3282e766a FIX: adjustments, the #define has the whiles already. 2017-09-28 23:14:51 +02:00
iceman1001 2934b22b05 CHG: fixing Header file 2017-09-28 22:39:07 +02:00
iceman1001 1e32ceb54c CHG: adding standalone as VPATH.. 2017-09-28 22:36:09 +02:00
iceman1001 72e53b0968 chg: disable emv for armsrc default. 2017-09-20 10:42:46 +02:00
iceman1001 14550557be CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation. 
* client/Makefile
 * common/Makefile.common
 2017-09-18 22:33:22 +02:00
iceman1001 28f1f23d48 chg: easy printing of MAKE variables 
Usage::
  make print-FLASHTOOL
  cd bootrom; make print-APP_CFLAGS
  cd client; make print-GCC_VERSION
 2017-09-18 18:59:51 +02:00
iceman1001 6d98779ff8 chg: 'hf 15 read' - nice output and with lock info 
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
 2017-09-06 22:04:00 +02:00
iceman1001 9d0ce1e874 chg: 'hf 15 reader' minor output changes 
chg: 'hf 15 info'  minor output changes
 2017-09-05 08:25:23 +02:00
iceman1001 508fa76915 ADD: 'hf list 15' - added annotation for ISO15693 2017-09-04 18:38:57 +02:00
iceman1001 ec07e2e006 FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start. 
sample:
   hf 15 reader
   hf list raw
 2017-09-04 13:56:57 +02:00
iceman1001 94f70caa7a when you need to add too much changes at the same time... 
fix: 'hf mf hardnested'  test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside,  a more unified way,  so we don't forget to turn of the antenna ...
chg:  renamed 'hf iclass snoop'  into 'hf iclass sniff'   in an attempt to make all sniff/snoop commands only SNIFF

chg: 'standalone' ->  starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
 2017-08-26 12:57:18 +02:00
iceman1001 eae8c2f7be chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same. 2017-08-11 20:48:54 +02:00
iceman1001 734ca940e9 fix: unified lf clone printouts of blocks. 2017-08-11 11:38:54 +02:00
iceman1001 bd4d1ec74e Fixes: lf simpsk - make sure Carrier input is ok. 
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim'  - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim'  - Helptext
lfdemod.C  got some reworked loops,  still some debug messages to be ...
 2017-08-10 14:19:57 +02:00
iceman1001 c583570a3d minor styleish 2017-08-06 16:31:01 +02:00
iceman1001 0acc606be3 lf search is working :) 2017-07-31 12:31:39 +02:00
iceman1001 91898babc0 FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples. 
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read'   now read does the same as all other LF,  and demod too...
 2017-07-30 21:21:02 +02:00
iceman1001 bf5b7e2d91 coverity scan, uninitialized vars. 
removed crapto1.
 2017-07-30 10:33:40 +02:00
iceman1001 f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001 a797314dab more adaptations 2017-07-27 22:05:54 +02:00
iceman1001 a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001 6519ae6f88 part of monstermerge... 2017-07-27 20:48:49 +02:00
iceman1001 f942e1ed05 ADD: CRC8Mad() should be used to calc the crc-8 byte for Mifare MAD config block. Doesn't work of course... 
CHG: some T/F defines..
 2017-07-27 09:31:23 +02:00
iceman1001 d2f79fa83f ADD 'lf nexawatch' by marshmellow42 
ADD 'lf securakey'  by marshmellow42
ADD 'lf pac'  by marshmellow42
chg: parity.h got some love from pm3 master.
 2017-07-14 15:51:12 +02:00
iceman1001 5f18400cbe FIX: 'hf iclass reader' marshmellows fixes. 
CHG:  removing some #define TRUE
 2017-07-07 12:38:49 +02:00
iceman1001 dd98b934bc CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key. 
CHG: 'hf iclass reader' -  two rules according to datasheet
  if app_limit is less than 0x6,  app_limit should be 0x6
  if app_limit is bigger than 31/0x1F on 2kb picopass,  the app_limit should be 26/0x1A
 2017-07-05 12:05:53 +02:00
iceman1001 213883a931 FIX: 'hf iclass reader' - now correctly identifes crypt-fuses configuration 
ADD: 'hf iclass reader' - now prints OTP value
 2017-07-05 11:21:38 +02:00
iceman1001 cb7ececdce FIX: updates to usb_cdc.c , starting with the MSOS features :) 2017-07-04 20:07:45 +02:00
Iceman d59026518e FIX: fullimage.s19 
According to @doegox  the *.s19 file is generated with wrong offset for the data section.
ref:  http://wiki.yobi.be/wiki/Proxmark#Flashing_full_image.2C_take_1
 2017-05-29 09:39:25 +02:00
Iceman 489e735f86 Update Makefile.common 
chg:  disabling 512kb flashing since it has issues with the flasher code.  Might enable it later on.
 2017-04-26 21:32:42 +02:00
iceman1001 905c55de2b ADD: analyse nuid - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1 has this option as a activation sequences. This NUID is also used for authenticate (cuid), not the block0 data. 
ref: http://www.gorferay.com/mifare-and-handling-of-uids/
 2017-03-10 09:48:36 +01:00
iceman1001 dfcf20d641 FIX: Coverity Scan fixes to emvcmd.c among others. 
FIX: emclearmem bug.
 2017-03-05 18:43:06 +01:00
egon2 37a71c7a96 fixes #85 2017-03-05 16:19:26 +00:00
iceman1001 91e9295761 FIX: had to make it clientside only 2017-03-03 12:27:35 +01:00
iceman1001 88e7a6bfa7 FIX: travisCI complains. dummy -> dummy_sgc. 2017-03-03 12:24:02 +01:00
iceman1001 9833360b25 chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex. 2017-03-03 11:36:07 +01:00
iceman1001 1ec412d97d FIX: moved from lfdemod.c -> graph.c SetGraphClock. 2017-03-02 21:15:01 +01:00
iceman1001 c6e5c7ea46 CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better. 
Still problem with finding the startindex...
 2017-03-02 21:00:51 +01:00
iceman1001 a9eeb57698 CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220 2017-03-01 20:14:46 +01:00
iceman1001 c24364a8a4 FIX: @marshmellow42 's ST detection fix. 
FIX: lfops.c and em4x05 command timings.
 2017-02-28 19:20:12 +01:00
iceman1001 4eabb8ad38 CHG: minor LF adjustments. 
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
 2017-02-28 16:55:16 +01:00
iceman1001 a8fd088d8b FIX: lf search - em410x demod was a bit greedy. 2017-02-28 14:47:25 +01:00
iceman1001 5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 2017-02-24 01:14:47 +01:00
iceman1001 8ad1e731c8 chg: @marshmellow42 's changes. 2017-02-23 00:52:40 +01:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001 19d9376c16 CHG: added some comments when changing the HAS_512_FLASH macro directive. 
CHG: 'make cli'  -  needs lualibs to compile.  well,  and more stuff ofcourse.
 2017-02-20 11:47:10 +01:00
iceman1001 4ac9f07840 CHG: lf em - added @marshmellow42 's changes 2017-02-19 00:12:35 +01:00
iceman1001 1a4b907335 CHG: some minor changes from @marshmellow42 2017-02-16 21:44:25 +01:00
iceman1001 bd09006a8c CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool. 
CHG:  'lf em4x' - refactored the code for emd4x50 demod
 2017-02-16 16:38:09 +01:00
iceman1001 e977fb0da3 syntax sugar 2017-02-13 15:33:26 +01:00
iceman1001 573e8d72c7 FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct. 
- armsrc/Makefile          when commenting out functionality,  move it below the comment otherwise APPS_CFLAG breaks to early.  See WITH_LCD
  - common/Makefile.common   enable / disable EMV,  uncomment two lines.  then make clean && make all.  flash,   MIGHT NOT work on 256kb devices

FIX: missing break in appmain.c made it go to iclass function..
 2017-02-13 15:32:48 +01:00
iceman1001 ed55e9aec4 chg: trying to generalize the EMV build. 2017-02-13 11:05:03 +01:00
iceman1001 5f5b83b743 ADD: 'lf cotag read' - COTAG can be read now. 2017-02-02 15:32:21 +01:00
iceman1001 e99acd00cc CHG: the mifare Auth command can make use of a random nonce aswell. 
CHG: since sim commands are timing critical, I'm testing a smaller prand prng function from Intel
 2017-01-29 10:41:48 +01:00
iceman1001 fbed30e8c9 chg: lets not have it static, since I get the same nonce in the same session over again. 2017-01-26 15:54:12 +01:00
iceman1001 bf5d7992ce ADD: @micolous random nonce, adjusted to fit in. Icemanfork only uses Moebius attack, so no need for an extra parameter in client. 
ref: https://github.com/Proxmark/proxmark3/pull/209
 2017-01-26 14:21:51 +01:00
iceman1001 e36b07efc4 CHG: moved into header files. 2017-01-25 00:35:11 +01:00
iceman1001 7d2692658b CHG: 'lf noralsy read' - new STT doesn't need so many bits. 2017-01-20 22:20:47 +01:00
iceman1001 371a40bf3e CHG: 'lf visa2000 read' - with new STT, the need to find 192bits is not neeeded. 2017-01-20 22:18:09 +01:00
iceman1001 1b75698cb7 FIX: 'lf hitag2' forgot to add some of @marshmellow42 's changes. Lf search should works just fine now. 2017-01-20 18:26:03 +01:00
iceman1001 a38f5a0704 FIX: @marshmellow42 's fixes for enhanced STT and AskDemod. Now the "lf presco read" works on cargs with strong/clean/clipped waves 2017-01-20 10:03:53 +01:00
iceman1001 81e82dfe51 syntax sugar 2017-01-18 22:56:55 +01:00
iceman1001 81b7e89434 CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679 
CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.
 2017-01-16 21:06:51 +01:00
iceman1001 d3fd5fd6d8 CHG: unused variables and remove of compiler warnings. 2017-01-16 15:00:40 +01:00
iceman1001 3acac886bc ADD: 'lf search' - added a rudimentary identification of IDTECK tags, will demod to PSK1, if fails it tries to PSK1 inverted demod. 2017-01-12 00:04:36 +01:00
iceman1001 76c74bf9ad CHG: 'hf iclass decrypt' - adjusted the loops, to only decrypt Application 1. However I've noticed not all blocks in Application 1 is encrypted. :/ Still needs to be adjusted. 
CHG: 'hf iclass reader'  - added some output accessrights from the CopyReader source code.

And ofcourse,  moved around stuff,  like the usages in cmdhficlass.c
 2017-01-10 18:23:05 +01:00
iceman1001 deba67ab57 CHG: cleaning up stuff 2017-01-03 01:20:03 +01:00
iceman1001 c08c796e8d CHG: enhanced the debug output for some LF demod/decode 2016-12-16 12:04:37 +01:00
iceman1001 207fc33a42 ADD: a Noralsy detection, looking for preamble 0xBB0 2016-12-15 15:50:12 +01:00
iceman1001 d48175d4f4 FIX: 'lf presco' demod fixes. 
ADD: 'lf search' now also looks for Presco.

I know that the helptext is wrong (d should be p)
 2016-12-15 00:01:31 +01:00
iceman1001 5daad82660 ADD: Visa2000 demod 2016-12-14 23:23:53 +01:00
iceman1001 50282b85e4 CHG: syntaxt suger 2016-12-09 14:39:34 +01:00
iceman1001 6804338201 FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method. (update2 is the older and correct version). This solves the pyrmid issue with wrong checksums calculated. 
Thanks to @rookieatall  @marshmellow42 for pointing out the bug. ref: http://www.proxmark.org/forum/viewtopic.php?id=4006
 2016-11-14 21:41:18 +01:00
iceman1001 2dcf60f3df CHG: "hf mf hardnested" - less printing 
CHG: some filehandles = NULL.
 2016-10-21 16:06:53 +02:00
iceman1001 da1f16d6ef CHG: increased debug output for Em410x 2016-10-16 21:50:41 +02:00
iceman1001 2f6df13cf7 CHG; syntax suger 2016-10-10 21:54:26 +02:00
iceman1001 5a08545794 ADD: added a compiling flag -DHAS_512_FLASH i common/Makefile.common, to be used for PM3 devices with 512KB. Original commit from @hewitt 2016-10-07 00:12:09 +02:00
iceman1001 77a689dbeb CHG: revert legiccrc8 to old algo. 
CHG: "hf legic decode" now loads EML memory
CHG: legic timings is better.
 2016-10-04 00:07:07 +02:00
iceman1001 44d9c722f0 CHG: Patch for making PM3 compatible to MCU's CDC-Host libraries Thanks to @cjbrigato to tweak the cdc imp. 
https://gist.github.com/cjbrigato/ef7fc18119f7c4900efbbef9bda0eb0f
 2016-10-03 08:03:47 +02:00
iceman1001 cb7902cdcd CHG: removed some debug data 
CHG: reverted back to old crc imp.
 2016-09-29 14:46:12 +02:00
iceman1001 b7e8338d2b FIX: forgot I removed some other stuff 2016-09-29 12:29:42 +02:00
iceman1001 a39944216d CHG: a select_legic function with structs and stuff and 2016-09-29 12:23:09 +02:00
iceman1001 11dee3d5a6 CHG; the devil is in the details 2016-09-26 21:53:51 +02:00
iceman1001 3c6542087e CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1. 2016-09-26 21:38:19 +02:00
iceman1001 62577a62ae FIX: Much of my added extra legic code is commented away now. 
FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env..
 2016-09-26 20:21:31 +02:00
iceman1001 fada2feaf7 ADD: @ikarus / @pwpiwi solution to stop treating GCC 6.1.1 warnings like errors. Should compile fine now on GCC6.1.1 2016-09-26 20:02:40 +02:00
iceman1001 7c91c8bf24 CHG: and now that I do actually check on bitlenght, I can get a better annotation yet again. Looking at it raises a question, acknowledge is 0x19 or 0x39, they just don't match up with tagtype identification of 0x0D, 0x1D, 0x39. I'll need to look at a 1024 tags response in a trace with a valid reader. 2016-09-26 12:58:11 +02:00
iceman1001 06c185d020 FIX: could be a problem, when not using parnethesis around inparams in #define. 2016-09-26 12:30:34 +02:00
iceman1001 337f703662 FIX: "indent" warns about this one. 2016-09-26 12:29:24 +02:00
iceman1001 93b7aa8f88 ADD; added some more descriptions of what the legic prng imp does. 2016-09-23 21:29:34 +02:00
iceman1001 22f4dca88c CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c 2016-09-21 19:03:32 +02:00
iceman1001 87342aadbc CHG: adjusted timing according to @sentinel 's traces 2016-09-14 16:18:04 +02:00
René Werner 1cb9b2a3cf used tabs instead of spaces 2016-09-13 21:04:13 +02:00
René Werner 78f59945a7 fixed indentation to get rid of warnings 
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
 2016-09-13 20:57:25 +02:00
iceman1001 ad5bc8cc8c In my attempts to make the LEGIC code better, its not working now. Timings if off. 
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
 2016-09-09 11:56:20 +02:00
iceman1001 e619ddc071 FIX: Better legic annotation, show which byte was targeted during read and write commands. 2016-09-03 12:20:12 +02:00
iceman1001 c71c5ee156 ADD: started to add tracelog in legic 
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
 2016-09-02 16:25:54 +02:00
iceman1001 5735cfa58e FIX: added a sanity check in preamble search to make sure it doesn't look out-of-bounds in the memcmp call 2016-09-01 20:34:56 +02:00
iceman1001 56d0fb8e4d FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed. 
REM: removed some debugstatements
 2016-09-01 16:09:31 +02:00
iceman1001 a2101157f7 FIX: Better udp_csr handeling. Usb messages gets to the device better, which makes "lf awid bruteforce" work :) 2016-08-26 16:22:56 +02:00
iceman1001 a1ab594e24 CHG: change the number of calls to prng_successor was done. Fewer should mean faster :) 2016-08-24 12:35:24 +02:00
iceman1001 7e08450dcc add: annotage Mifare Desfire. from 3102c1bae3 (diff-93cfa90a992ea759349344d0de98029e) 
Thanks @johannesStoye
 2016-08-14 16:29:39 +02:00
iceman1001 82e690f48b CHG: trying to unify the crc algos in one place. 2016-08-04 21:52:32 +02:00
iceman1001 b1013281d3 minor textual fix 2016-07-31 22:01:40 +02:00
iceman1001 a41d3dbb90 ADD: started to rework the wiegand converting. Extracted it from the 'lf hid' file. Looks decent but still needs work. 2016-07-31 21:58:15 +02:00
iceman1001 514ddaa2ff CHG: help text changes in cmdlfjablotron.c 
CHG: increase byte size to uint16_t in crc.c CRC16Legic
 2016-07-29 20:58:52 +02:00
iceman1001 29ce214c65 CHG: better printing output of card ID 
CHG: better detecting in preambl. 16bits with 1, and a zero bit.  Also cleared this topbit when cloneing and simulating.
 2016-07-29 14:31:39 +02:00
iceman1001 6c28395106 ADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH. 
CHG: removed no-existing crc8ja code
FIX: a check in ASKbiphaseDemod to make sure graphbuff is not empty.
 2016-07-29 11:04:12 +02:00
iceman1001 ba4ad25b37 FIX: Fixed some warnings I didn't take notice off. 
- memcpy should have been "memset"
- forgot to add function declaration into header file.
 2016-07-28 22:17:44 +02:00
iceman1001 3e134b4c20 CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED* 
CHG: changed the CRC implementations.
 2016-07-28 21:41:44 +02:00
iceman1001 0cbe0cb8d6 chg: changed comment 2016-07-07 02:13:02 +02:00
iceman1001 9686a8d4d5 @marshmellow42 's fix askAMP 16ea2b8ca3 2016-06-20 13:21:36 +02:00
iceman1001 15d49e8285 CHG: NEDAP, changed back the preamble. With new parity check it has a decent detection. 2016-05-04 10:35:10 +02:00
iceman1001 c71f4da9bc CHG: increased the preamble 
CHG:  from inverted to non-inverted. 2 of the forum samples is non-inverted.

Block 0:  00150080
 2016-05-02 21:21:43 +02:00
iceman1001 96faed2124 CHG: added the ASK/Biphase demod of signal for NEDAP demod. 
ADD: 'LF SEARCH'  now also checks for NEDAP.
 2016-05-02 14:06:08 +02:00
iceman1001 56bbb25a41 ADD: started with a NEDAP demod, read, clone and sim functionality. 
The encrypted part is not solveabled today.
 2016-05-02 13:42:06 +02:00
iceman1001 c0afa86f75 FIX: this commit solves a sneaky bug in 'LF VIKING' commands. The getVikingBits dropped the highest byte in the uid while creating the datablocks for the clone. 
ADD:  added some extra message in debugmode when looking at viking tags.
 2016-04-24 21:41:45 +02:00
iceman1001 ad493abc2a CHG: changed to the new flasher command. 2016-04-21 10:32:06 +02:00
iceman1001 c805748f34 ADD: added a method for le32toh. Converting bytes to uint32_t . 
CHG: correct use of FILE_PATH_SIZE in the tracelogging functions.
 2016-04-18 13:05:35 +02:00
iceman1001 9358e49641 ADD: triplesized UID 
ADD: ACK, NACK, defines from mifareutil.h
 2016-04-14 11:38:16 +02:00
iceman1001 f3782960fa syntax cleaning. 2016-03-21 22:09:04 +01:00
iceman1001 0fcfad0ee6 CHG: testing for windows clients to get a higher baudrate. Was 9600, testing 115200 as for non_win. 
CHG: testing to set USB 2.0 standard,  instead of USB1.1  ...
 2016-03-21 22:05:59 +01:00
iceman1001 7fa7e812fc ADD: added @marshmellow42 's changes to "lfdemod" 2016-03-20 19:39:06 +01:00
iceman1001 9206d3b034 ADD: copied all EMV files from peter filmoores fork. Have not started with making it work in current fork. (a lot of work) 2016-03-20 19:37:29 +01:00
iceman1001 38e4191705 CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now. 2016-03-06 10:35:25 +01:00
iceman1001 0db11b71ef ADD: Added the HitagS from @spenneb ref:https://events.ccc.de/congress/2015/Fahrplan/events/7166.html 
PM3 Master PR: https://github.com/Proxmark/proxmark3/pull/167

Adjusted the ENUM names to fit in my fork.  We need a better namestandard for it.
 2016-03-04 19:06:47 +01:00
iceman1001 ff4ff94b25 DEL: Removed old comment, after I've been compiling and testing all -W parameters in it. Didn't find any new warnings. Which is good. 2016-03-01 06:58:32 +01:00
iceman1001 c728b2b4cf FIX: Added @marshmellow42 's fix for ASK/Biphase simulation on deviceside. 
CHG: Added @marshmellow42 's refactoring of "gprox-II" demod.
 2016-03-01 06:57:02 +01:00
iceman1001 0d2c590974 ADD: num_to_bytebitsLSBF function. 
ADD: lf guard clone - works...  needs some checking.
ADD: added a option to "addparity" to set zero on fixed pos.
 2016-02-28 22:43:21 +01:00
iceman1001 cd0bed3c98 FIX: textual fix 2016-02-22 17:51:07 +01:00
iceman1001 0516439959 ADD: Added @marshmellow42 's new ST (sequence terminator detection) 2016-02-19 22:30:19 +01:00
iceman1001 07f970aad7 chg: ego credits....one of these days I'll remove 'em 2016-02-18 17:48:17 +01:00
iceman1001 1d5464397c ADD: first try to implement crc-16 for Legic Advant *not working yet* Can't verify it. 2016-02-16 10:44:12 +01:00
iceman1001 4469412e88 ADD: adding a presco demod, given 0x10D as preamble, .. *work in progress* 2016-02-14 11:58:25 +01:00
iceman1001 6bb7609cad CHG: had to move the SwapBits method. 2016-02-12 16:19:18 +01:00
iceman1001 6b6815bccb CHG: extracted a #define for the crc16 poly 2016-02-12 12:34:54 +01:00
iceman1001 ee4e281675 FIX: legic_prng.c according to user on forum ref: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437 needs to be "& 0x7F" 
ADD:  method for calculating the storage crc8.
 2016-02-12 12:34:05 +01:00
iceman1001 a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +01:00
iceman1001 df4ee66ea9 CHG: my idea of malloc and free for bucketsort didn't work so well. Back to the original. 2016-02-10 21:44:32 +01:00
iceman1001 089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001 b351374ca8 CHG: Reversed @piwi 's changes to parity. I'm getting assembler compiler errors. 2016-01-16 23:05:21 +01:00
iceman1001 a531720ae6 added @pwpiwi 's latest changes to "hf mf hardnested" 2016-01-03 17:16:50 +01:00
iceman1001 08e11f0a90 REM: removed an offensive #include on archlinux. Compiles on mingw without. 2015-12-23 23:26:03 +01:00
iceman1001 f4d0ffd1b9 CHG: some textual change to README.txt 
ADD: a prng.c to collect some different PRNG's i've ran into
ADD: some changes the tea implementation
ADD: a enhanced version - SwapEndian64ex
 2015-12-21 19:48:00 +01:00
iceman1001 2b1f4228c2 ADD: @marshmellow42 's changes to "hf mfu *" , 
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
 2015-12-15 09:34:55 +01:00
iceman1001 508b37ba9c REM: removed an unused doublett function "printBits" in util.c 
ADD:  added a new string helper function "sprint_hex_ascii" in util.c
ADD:  added "LF AWID BRUTE", a very simple bruteforce command for the awid commands.
      it takes a facility-code,  and iterates all possible 0xFFFF cardnum by sending sim command. It also uses the usb_poll function to stop the bruteforce on keypress and not leaving the pm3 device running the simulation.
the command implements the help parameter.
 2015-12-14 22:50:54 +01:00