Commit Graph

3631 Commits

Author SHA1 Message Date
Philippe Teuwen
281cdead26 ltrim cmd before display 2019-04-28 22:38:44 +02:00
Philippe Teuwen
334e6d208b hf mf eload: fix absence of filename 2019-04-28 22:16:50 +02:00
Philippe Teuwen
997f5d700e detect wrong numOfBlocks / numOfSectors arguments 2019-04-28 21:34:05 +02:00
Philippe Teuwen
1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
Philippe Teuwen
405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
Philippe Teuwen
c6172b4d9c LoadEML: don't complain on the last \n 2019-04-28 16:47:50 +02:00
Philippe Teuwen
8ebc44ee81 fix segfault 2019-04-27 16:52:23 +02:00
Philippe Teuwen
200290bc56 doc multiple commands with -c 2019-04-27 00:33:14 +02:00
Philippe Teuwen
d3cc0bb71c Add support for: proxmark3 -c "hw ping;hw version;hw ping" 2019-04-27 00:31:05 +02:00
Philippe Teuwen
897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen
4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +02:00
iceman1001
4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
iceman1001
cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen
cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001
88744650db Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 08:56:16 +02:00
Philippe Teuwen
70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
iceman1001
de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +02:00
Philippe Teuwen
7d6f971db4 archive and fix hid-flasher 2019-04-26 00:11:45 +02:00
iceman1001
5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen
f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +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
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