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

358 Commits

Author SHA1 Message Date
Philippe Teuwen
f1deb865db Merge branch 'master' into experimental_varlen 
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
 2019-04-28 22:53:12 +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
iceman1001
9779868753 style 2019-04-28 11:09:46 +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
ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +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
Eloff
a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +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
166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Philippe Teuwen
1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Eloff
960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen
533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen
7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001
587d826f84 textual 2019-04-17 20:36:10 +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
74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001
7b30126371 style 2019-04-16 15:29:18 +02:00
Philippe Teuwen
5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
Philippe Teuwen
05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
iceman1001
a872f04c1e textual 2019-04-11 17:19:48 +02:00
Philippe Teuwen
0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
Philippe Teuwen
3d6d58aae5 internal help fcts -> static 2019-04-10 13:06:05 +02:00
Philippe Teuwen
cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
osboxes.org
ad52243981 style 2019-04-10 09:36:23 +02:00
Philippe Teuwen
a561370f8d more strncpy fix 2019-04-09 20:15:08 +02:00
iceman1001
87660df8f2 fix: 'hf mf hardnested' - not verify key when reading nonce file 2019-04-09 17:14:47 +02:00
iceman1001
b37981df74 shadow 2019-04-07 20:08:53 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
vratiskol
6e8b3c29ba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 22:18:39 +02:00
iceman1001
0383d7f052 chg: 'hf mf restore' - add finish message 
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
 2019-04-03 15:34:36 +02:00
vratiskol
1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001
fb9d34447e style 2019-03-18 23:59:35 +01:00
vratiskol
c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001
4f88d7105f style 2019-03-18 20:24:09 +01:00
Philippe Teuwen
f51e6fbad2 fix double free 2019-03-16 01:26:15 +01:00
vratiskol
cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim" 
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
 2019-03-15 21:45:00 +01:00
vratiskol
cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol
6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol
64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
iceman1001
7d88c22aaf chg: added limit check for loadfile 
rename: 'lf hitag checkchallenges'  ->  'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
 2019-03-14 08:24:49 +01:00
iceman1001
35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00