RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5642 commits 3 branches 14 tags 86 MiB
Commit graph

5642 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Teuwen a60b2f24a8 update.sh flash boot only if option -b 2019-04-26 23:51:43 +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
Philippe Teuwen a1bb2ec106 Trying original SPI mode for 24MHz flash mem 2019-04-26 22:17:26 +02:00
iceman1001 87eee0cf5c text 2019-04-26 13:07:45 +02:00
iceman1001 4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
iceman1001 4494c3dc61 text 2019-04-26 10:46:00 +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
Philippe Teuwen acc101ed37 doc magic 2019-04-26 08:29:21 +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
Philippe Teuwen 9a6ad6597f update standalone readme 2019-04-25 23:40:51 +02:00
Iceman 839a0ef9fb
Update readme.md 2019-04-25 23:23:44 +02:00
Iceman 1e797e1720
Update readme.md 2019-04-25 23:20:54 +02:00
Iceman f90b04d4cf
Update readme.md 2019-04-25 23:20:33 +02:00
Philippe Teuwen 3e641e217d remove redundant def 2019-04-25 23:09:06 +02:00
iceman1001 9102c37292 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 22:51:30 +02:00
iceman1001 5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen 423e6bfb32 adjust standalone doc 2019-04-25 22:43:08 +02:00
Philippe Teuwen c616f47d6b Use placeholder for standalone mode if needed 2019-04-25 22:40:46 +02:00
Philippe Teuwen 5d6f2c641b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 22:25:10 +02:00
Philippe Teuwen f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
iceman1001 505506c5dd textual 2019-04-25 21:50:55 +02:00
iceman1001 7220653ccd chg: refactor standalone mode info string 
add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 21:44:34 +02:00
iceman1001 a59f7a50ce fix: spellingmistake 2019-04-25 21:21:53 +02:00
iceman1001 d913cacdca Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 21:16:39 +02:00
iceman1001 176645b9fc REM: removed unused define 2019-04-25 21:16:11 +02:00
Philippe Teuwen 27e94f5669 remove redundant def 2019-04-25 20:59: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