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
5612 commits 3 branches 15 tags 87 MiB
Commit graph

5612 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
176645b9fc REM: removed unused define 2019-04-25 21:16:11 +02:00
iceman1001
c84cf10d86 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 20:52:24 +02:00
iceman1001
a6278ff8cd chg: forgot to readd hitag support :) 2019-04-25 20:51:20 +02:00
Philippe Teuwen
a844afc273 Guard Hitag code 2019-04-25 20:42:41 +02:00
iceman1001
ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +02:00
iceman1001
5cc3a1b717 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 16:55:48 +02:00
iceman1001
3bfd01bffb fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine. 2019-04-25 16:55:00 +02:00
Iceman
f227041932
Merge pull request #172 from McEloff/hfmfu 
UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 16:10:03 +02:00
iceman1001
fe35a972f5 fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 
remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
 2019-04-25 16:08:08 +02:00
iceman1001
90463cb79f fix again OSX 2019-04-25 09:49:47 +02:00
iceman1001
980ad29d22 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 08:29:42 +02:00
iceman1001
ce8d5c66ab fix https://github.com/RfidResearchGroup/proxmark3/issues/173 
this seems to work for OSX,  and improved linux version with fallback.
 2019-04-25 08:29:15 +02:00
Philippe Teuwen
42a03fc9f1 Add openocd config files for JLink 2019-04-25 02:00:23 +02:00
Philippe Teuwen
9fca642e10 Add makefile dependencies for recovery: need bootrom & os 2019-04-25 01:59:30 +02:00
Philippe Teuwen
1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows 2019-04-24 15:04:43 +02:00
Philippe Teuwen
25048ccf2f Fix segfault when loading a file 2019-04-24 00:53:25 +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
Eloff
8793a9e596 Merge commit 'e171010d' into hfmfu 
# Conflicts:
#	CHANGELOG.md
 2019-04-22 23:26:20 +03:00
Eloff
4161779083 loops for counters output 2019-04-22 23:20:35 +03:00
Philippe Teuwen
127f5ed192 Revert c7a4d7af, remove redundant include 2019-04-22 22:11:57 +02:00
iceman1001
04536a3564 translation 2019-04-22 19:31:22 +02:00
iceman1001
3bd145652b document offsets 2019-04-22 19:29:45 +02:00
iceman1001
458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001
166da51360 textual 2019-04-22 19:21:07 +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
Eloff
db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen
c7a4d7af3a Add ref to new mifaresim.h in standalone modes 2019-04-19 23:15:02 +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
03a1b6fac0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-19 09:23:59 +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
Eloff
52d1b7341f typo 2019-04-19 09:39:11 +03:00
Eloff
960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen
0e855f647a typo 2019-04-18 10:45:24 +02:00
Oleg Moiseenko
1d60cf3bd6
Merge pull request #169 from merlokk/sf 
smallfix
 2019-04-18 11:26:21 +03:00
merlokk
8bf8f1735e smallfix 2019-04-18 11:25:57 +03:00
iceman1001
1033b67f3c chg: fpga lf simulation 2019-04-18 09:41:31 +02:00
iceman1001
72dd4d5dde chg: 'fpga lf sim' - 25% both on sides. 2019-04-18 09:27:38 +02:00
iceman1001
587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001
2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
Oleg Moiseenko
31acb134c1
Merge pull request #168 from merlokk/appve2 
Appve2
 2019-04-17 19:55:59 +03:00
merlokk
557aa984d4 timeout fix 2019-04-17 19:53:58 +03:00
merlokk
44416b722e small fix 2019-04-17 19:42:10 +03:00
merlokk
34c51c5632 add termcap 2019-04-17 19:37:11 +03:00
merlokk
b1841f1d24 add readline and small fix 2019-04-17 19:16:10 +03:00
Iceman
6a8d3aa5b6
Merge pull request #167 from merlokk/appve2 
rdp
 2019-04-17 17:52:36 +02:00
merlokk
c48b16100f rdp 2019-04-17 18:40:19 +03:00