Commit graph

1442 commits

Author SHA1 Message Date
Iceman
9e1a84c7ab
Merge pull request #151 from McEloff/temp
'hf mf sim' nested authentication
2019-04-09 09:27:33 +02:00
vratiskol
a2a1bbb7a1 Add message about debug message 2019-04-09 00:07:06 +02:00
vratiskol
1fc5fea623 Debug level => MF_DBG_EXTENDED
- Add comment
- Debug level MF_DBG_EXTENDED
2019-04-08 23:48:27 +02:00
Eloff
f13f7f4cbb Pull request #145. Next part of changes 2019-04-08 19:15:15 +03:00
Iceman
b0b996a67c
Merge pull request #145 from McEloff/temp
'hf mf sim' - bugs fix, refactoring
2019-04-08 14:18:06 +02:00
iceman1001
5585290981 fix: dereference 2019-04-08 11:40:52 +02:00
iceman1001
4b12b2cdf3 unshadow 2019-04-08 09:47:20 +02:00
iceman1001
1833ad5616 unshadow 2019-04-08 09:46:12 +02:00
McEloff
4588384587
Merge branch 'master' into temp 2019-04-08 10:26:30 +03:00
iceman1001
a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001
ef610f373a style 2019-04-07 16:21:27 +02:00
Philippe Teuwen
8c359921e9 keybytes for MifareUC_Auth 2019-04-07 12:30:49 +02:00
Philippe Teuwen
7485c5ed2e armsrc BitStream -> bits 2019-04-07 12:23:34 +02:00
Philippe Teuwen
9c3a520300 iso14443a_select_card resp_data -> p_card 2019-04-07 12:18:20 +02:00
iceman1001
6cc62b7985 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-07 12:11:08 +02:00
iceman1001
7eee2acfbf more crc overshadow 2019-04-07 12:10:52 +02:00
Philippe Teuwen
a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001
c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001
91897f1f2e copy bytes 2019-04-07 12:06:48 +02:00
iceman1001
1e35130fbe missing include 2019-04-07 11:41:43 +02:00
iceman1001
4856252912 styles 2019-04-07 11:39:49 +02:00
iceman1001
49a0fda10b styles 2019-04-07 11:36:24 +02:00
iceman1001
c9b3dd32d1 remove random 2019-04-07 11:00:28 +02:00
iceman1001
ff74d56741 remove unused 2019-04-07 10:58:50 +02:00
iceman1001
593202867a remove include 2019-04-07 10:56:35 +02:00
iceman1001
3ab9dbe4c6 fix styles 2019-04-07 10:52:52 +02:00
iceman1001
8e6920cd95 fix styles and warnings 2019-04-07 10:40:59 +02:00
iceman1001
db78d26b9f styles 2019-04-07 10:33:34 +02:00
iceman1001
da7dc2353c style and warnings 2019-04-07 10:30:52 +02:00
iceman1001
aea6c6d3c5 fixes, shadow 2019-04-07 10:17:43 +02:00
Philippe Teuwen
ebdfba033d arg names 2019-04-06 20:35:58 +02:00
Philippe Teuwen
a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen
a27d549a60 WritePageHitagS: why on earth page <> page_ 2019-04-06 19:48:20 +02:00
Philippe Teuwen
1b9914288d remove extern 2019-04-06 19:10:34 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen
2603c8d0d1 Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
  Astyle
  Verbose mode
  ReSync file
  Add Encrypted data test
  Mifare 10B UID
  cardAUTHKEY log
  Remove FLAG_RANDOM_NONCE
  Mifare Sim
  LogTrace
  Log Level
  Use Variable
  Add Variable for MAX_MIFARE_FRAME_SIZE
  Add Data Block debug
  Correct flags & test
  Correct return
  Revert "Merge branch 'master' into hf_mf_sim"
  Sync from Upstream
  Astyle update
  hf mf sim
2019-04-06 19:06:16 +02:00
iceman1001
127dc74674 chg: only english 2019-04-06 15:50:45 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen
26eb54b965 style 2019-04-06 01:00:54 +02:00
vratiskol
567ceb017b Astyle 2019-04-06 00:39:27 +02:00
vratiskol
2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
vratiskol
e24a0cfe17 Verbose mode 2019-04-06 00:32:11 +02:00
iceman1001
1773cfcf39 style 2019-04-05 18:51:19 +02:00
vratiskol
bc11ff88ea Add Encrypted data test 2019-04-05 03:58:15 +02:00
vratiskol
0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
Eloff
791ff18381 'hf mf sim' - bugs fix, refactoring 2019-04-05 00:15:55 +03:00
Eloff
19cf50a6ff Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support 2019-04-03 22:26:18 +03:00
vratiskol
1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen
07cc0d0a29 make style helped revealing my bug :) 2019-04-02 22:34:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +02:00