RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-18 11:07:28 +08:00
Code Issues Projects Releases Packages Wiki Activity
5752 commits 3 branches 15 tags 87 MiB
Commit graph

3691 commits

Author SHA1 Message Date
iceman1001
195887487b fixes to commands.lua to support MIX/NG 2019-04-28 16:35:30 +02:00
iceman1001
292462fb74 fixes to sendMIX/SendNG 2019-04-28 16:31:49 +02:00
iceman1001
cc5b63823b chg: better sending 2019-04-28 12:52:25 +02:00
iceman1001
9779868753 style 2019-04-28 11:09:46 +02:00
iceman1001
abf93f4f2c Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 2019-04-28 11:05:51 +02:00
iceman1001
c13f9e7a0f add: SendCommandMIX, SendCommandOLD support in LUA 2019-04-28 11:05:23 +02:00
Philippe Teuwen
fbec3f3125 Merge branch 'master' into experimental_varlen 
* master:
  fix segfault
  rework shell scripts for easy client or flasher
  Stop poking Internet when compiling
  doc multiple commands with -c
  Add support for: proxmark3 -c "hw ping;hw version;hw ping"
  update.sh flash boot only if option -b
 2019-04-27 16:55:28 +02:00
Philippe Teuwen
8ebc44ee81 fix segfault 2019-04-27 16:52:23 +02:00
iceman1001
c5c364d994 fix: compilation on mingw 2019-04-27 11:57:11 +02:00
iceman1001
238eda8b17 chg: 'hw detectreader' cleanup 2019-04-27 11:07:59 +02:00
Philippe Teuwen
e2e0b704c5 Several changes in the initial connection, see details: 
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
 2019-04-27 02:46:20 +02:00
Philippe Teuwen
7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen
12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +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
e9bfc3eb7a Merge branch 'master' into experimental_varlen 
* master:
  rename usb_present
  TestProxmark only if OpenProxmark returned pm3 present
  Trying original SPI mode for 24MHz flash mem
  text
 2019-04-26 23:30:30 +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
3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen
01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
Philippe Teuwen
b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen
a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001
4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
Philippe Teuwen
1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +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
Philippe Teuwen
540fecb760 Merge branch 'master' into experimental_varlen 
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  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 23:01:49 +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
0fc79824dd Merge branch 'master' into experimental_varlen 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
 2019-04-25 20:59:27 +02:00
Philippe Teuwen
a844afc273 Guard Hitag code 2019-04-25 20:42:41 +02:00
Philippe Teuwen
eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00
iceman1001
df96b58fcc style 2019-04-25 17:06:40 +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
4b5800d78f remove name 2019-04-24 15:57:24 +02:00
Philippe Teuwen
517bf7e238 Merge branch 'master' into experimental_varlen 
* master:
  Force no-ms-bitfields to ensure proper struc packing on Windows
 2019-04-24 15:05:09 +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
79d7fb65b5 Merge branch 'master' into experimental_varlen 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
 2019-04-24 00:59:57 +02:00
Philippe Teuwen
25048ccf2f Fix segfault when loading a file 2019-04-24 00:53:25 +02:00
Philippe Teuwen
e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00