Commit graph

3611 commits

Author SHA1 Message Date
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
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
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
iceman1001
458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001
166da51360 textual 2019-04-22 19:21:07 +02:00
Eloff
db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03: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
587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001
2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
iceman1001
b574db169e textual 2019-04-17 16:56:52 +02:00
iceman1001
853d2e14e6 null term? 2019-04-17 16:53:28 +02:00
iceman1001
ec7ab1a4ed fix: https://github.com/RfidResearchGroup/proxmark3/issues/166 2019-04-17 16:52:58 +02:00
iceman1001
3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001
1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001
da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001
524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001
e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001
2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001
f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001
72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001
bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
iceman1001
6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001
01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001
53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001
3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001
d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001
002e6b23fe Use printandlogex 2019-04-17 11:47:32 +02:00
Eloff
63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
iceman1001
436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
iceman1001
33b4a32dfd removed 2019-04-16 19:06:18 +02:00
iceman1001
8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001
2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001
74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001
aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
iceman1001
d17191d0a4 style 2019-04-16 16:11:46 +02:00