Commit graph

325 commits

Author SHA1 Message Date
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
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen
edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
Philippe Teuwen
abddff513e loadFile: fix double free 2019-03-08 19:49:12 +01:00
merlokk
2e8771d7a3 added hf mf ndef 2019-03-05 19:57:08 +02:00
merlokk
9c8e60cf03 added to hf mf mad 2019-03-04 19:44:19 +02:00
merlokk
ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
2019-03-01 19:37:43 +02:00
merlokk
979aa678ad small fix 2019-03-01 19:07:34 +02:00
Chris
c2046f2e65 CHG: 'hf mf dump' - now saves in BIN/EML/JSON default
CHG: 'hf mf esave' - now saves in BIN/EML/JSON default
2019-02-25 22:33:49 +01:00
iceman1001
aaac99fdee fix: 'hf mf csave' unused code 2019-02-24 19:46:09 +01:00
iceman1001
f58c47a7b8 cleanup 2019-02-24 19:38:16 +01:00
iceman1001
cea5b5214d chg: colors 2019-02-24 14:51:21 +01:00
merlokk
20be5c5d9f some of MAD2 code 2019-02-22 19:58:50 +02:00
iceman1001
140c327cc2 CHG: 'hf mf list' - readded it. calls trace list mf in the back 2019-02-22 09:43:03 +01:00
iceman1001
7ea7061ed0 fix: 'hf mf cload' - wrong free 2019-02-21 23:22:39 +01:00
merlokk
db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk
3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
iceman1001
6d63b3fbed fix: mem leaks. 2019-02-21 16:17:49 +01:00
iceman1001
de317d9f48 fix: mem leaks. 2019-02-21 15:39:36 +01:00
iceman1001
06ade9970a FIX: mem leaks
FIX: 'hf mf nested' - params
2019-02-20 22:29:39 +01:00
merlokk
583b732268 add hf mf mad command 2019-02-20 21:12:50 +02:00
iceman1001
72cf200df7 chg.... 2019-02-18 16:43:27 +01:00
iceman1001
b320ebca7c chg: textual 2019-02-18 16:39:39 +01:00
iceman1001
38437a3916 chg: colors 2019-02-18 15:47:48 +01:00
iceman1001
fc1ed47d57 chg: more colors 2019-02-18 15:37:26 +01:00
iceman1001
23d0b6b1c6 chg: colors 2019-02-18 14:59:19 +01:00
iceman1001
06fc95b62d chg: 'hf mf fchk' - textual 2019-02-18 10:41:54 +01:00
iceman1001
cacba04959 chg: 'hf mf fchk' - better handling when no keys was found. 2019-02-18 10:38:49 +01:00
iceman1001
7e601e5285 chg: textual 2019-02-18 10:27:14 +01:00
vratiskol
8e6b41f513 Use Variable for MIFARE_MINI_MAXSECTOR
Modify type uint16_t => 256
2019-02-15 15:17:28 +01:00
vratiskol
35df317a2c
Update MAXBLOCK - MF 4K
- Modify MAXBLOCK size: 4k => 256
- Typo
2019-02-15 01:08:30 +01:00
iceman1001
ed7122e409 chg: use calloc 2019-01-30 20:21:41 +01:00