dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,692 Commits 7 Branches 1 Tag
0fc79824dd32ff546da4ec3da9213fd10d705f4d
Commit Graph

3658 Commits

Author SHA1 Message Date
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
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
9602e641e2 Merge branch 'master' into experimental_varlen 
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
 2019-04-22 21:39:38 +02:00
iceman1001
458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001
166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen
d6892136ac Add communication_delay also to dl_it timeout 2019-04-22 02:44:06 +02:00
Philippe Teuwen
3e402797c1 dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples) 2019-04-22 02:11:46 +02:00
Philippe Teuwen
eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen
913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen
75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Eloff
db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen
4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen
a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen
3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen
95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen
238fc10c9a style 2019-04-20 01:08:07 +02:00
Philippe Teuwen
7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Eloff
52d1b7341f typo 2019-04-19 09:39:11 +03:00
Philippe Teuwen
128d90ca3c SendCommandOLD: hid-flasher 2019-04-19 02:10:52 +02:00
Philippe Teuwen
b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen
2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen
45afe8dec0 errors retval for cmdemv 2019-04-19 01:14:58 +02:00
Philippe Teuwen
a6f52e839f fix bug 2019-04-19 01:14:04 +02:00
Philippe Teuwen
1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen
38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
Philippe Teuwen
dcfee8963b SendCommandOLD & errors: cmdflashmem 2019-04-18 23:26:12 +02:00
Philippe Teuwen
7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen
9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen
b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00