RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 18:57:12 +08:00
Code Issues Projects Releases Packages Wiki Activity
5703 commits 3 branches 15 tags 87 MiB
Commit graph

606 commits

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