Commit graph

552 commits

Author SHA1 Message Date
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