RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 01:55:38 +08:00
Code Issues Projects Releases Packages Wiki Activity
5860 commits 3 branches 14 tags 86 MiB
Commit graph

1574 commits

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