Commit graph

4891 commits

Author SHA1 Message Date
Philippe Teuwen
4ffeebc193 Fix return code check for iso14443b_select_card in hf epa 2019-03-05 16:39:26 +01:00
merlokk
c7c97d35b5 some code to decoding payload 2019-03-05 17:25:11 +02:00
merlokk
7003783c08 refactoring 2019-03-05 16:43:13 +02:00
merlokk
fffa921aa0 ndef record decode OK 2019-03-05 16:41:20 +02:00
Iceman
5228cb5338
Merge pull request #110 from mazodude/master
Delete MAD script as merlokk has implemented it
2019-03-05 04:39:06 +01:00
Iceman
3a4187555e
Merge pull request #109 from sh7d/mad-ignore-shitty-checksum
Mifare mad - do not exit if checksum is shitty
2019-03-05 04:38:49 +01:00
merlokk
34a133451e small addon 2019-03-05 01:02:54 +02:00
merlokk
3bf618ca56 log structure 2019-03-05 00:54:45 +02:00
merlokk
64a5b355b5 added ndef record parse sketch 2019-03-05 00:51:32 +02:00
merlokk
a2f8f0628c added ndef tlv parsing 2019-03-05 00:48:02 +02:00
merlokk
0a30e03aaf add header 2019-03-05 00:13:01 +02:00
merlokk
cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
mazodude
760cd7b87c Delete MAD script as merlokk has implemented it 2019-03-05 08:36:04 +11:00
mazodude
fef7e78957 Merge remote-tracking branch 'upstream/master' 2019-03-05 08:35:03 +11:00
sh7d
59bae84531 Mifare mad - do not exit if checksum is shitty 2019-03-04 22:12:10 +01:00
Oleg Moiseenko
8cb2ee5d7e
Merge pull request #108 from doegox/master
Add missing header
2019-03-04 22:26:41 +02:00
Philippe Teuwen
0944a12744 Add missing header 2019-03-04 20:27:57 +01:00
merlokk
e191219d8a reading NDEF data from card 2019-03-04 20:22:25 +02:00
merlokk
54e8196774 hf mfp ndef sketch 2019-03-04 20:04:24 +02:00
Oleg Moiseenko
6fa81303a5
Merge pull request #107 from merlokk/mad_read
Mad read
2019-03-04 19:45:58 +02:00
merlokk
9c8e60cf03 added to hf mf mad 2019-03-04 19:44:19 +02:00
merlokk
f45c330843 small visual fixes 2019-03-04 19:25:13 +02:00
merlokk
2c07bb790c hf mfp mad read contents by aid 2019-03-04 19:18:44 +02:00
Chris
dcdb2ee218 fix: 'script run ndef_dump.lua' - move function 2019-03-01 19:24:02 +01:00
Chris
11f86c2d95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-01 19:08:08 +01:00
Oleg Moiseenko
20297f7c62
Merge pull request #106 from merlokk/mf_mad
mf and mfp mad commands
2019-03-01 19:40:18 +02:00
merlokk
e8c0a49d07 changelog 2019-03-01 19:39:17 +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
3a98c9fcd3 fix mad2 crc8 check 2019-03-01 19:13:59 +02:00
merlokk
979aa678ad small fix 2019-03-01 19:07:34 +02:00
merlokk
5cc4bea4e3 mfp refactoring 2019-03-01 19:05:51 +02:00
merlokk
6208a6869c added mad decode for mfp 2019-03-01 18:50:25 +02:00
merlokk
4d79ced1a9 ашчуы шт ьфвюс 2019-03-01 18:49:53 +02:00
Chris
ef2fc5b66c fix: 'hw tune' - reset demodplot line and grid clock 2019-03-01 12:09:35 +01:00
iceman1001
d73c501ffa another 2019-02-26 22:27:33 +01:00
Chris
8f05aa6fcf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-25 22:34:30 +01: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
8c6312e209 fix mem leaks 2019-02-25 19:10:37 +01:00
iceman1001
972f8590e0 fix dereference 2019-02-25 19:10:00 +01:00
iceman1001
56a75fbf0b fix: bad division 2019-02-25 19:03:31 +01:00
iceman1001
d6bb8d630a fix: strings 2019-02-25 19:03:14 +01:00
Iceman
6db8483434
Merge pull request #103 from 3ldidi94/master
Add key to default_iclass_keys.dic
2019-02-25 18:56:06 +01:00
3ldidi94
d929f31eb3
Update default_iclass_keys.dic 2019-02-25 18:52:44 +01:00
iceman1001
64bae8c8be fix: 'data detectclock' - now prints clock again... 2019-02-25 15:07:31 +01:00
Chris
81f8749caf text 2019-02-25 12:46:06 +01:00
Chris
711d384e7d chg: 'data autocorrelate g' - visual with gridclock patter and markup of two tops. Also added a "visual" inspection of peaks with 3% tolerance. This increases usability quite much. 2019-02-25 12:44:21 +01:00
iceman1001
a8eb0fd05f colors 2019-02-25 00:38:48 +01:00
iceman1001
a4ecc6d3ce colors 2019-02-25 00:32:59 +01:00
iceman1001
e3a0594b98 colors 2019-02-25 00:31:00 +01:00
iceman1001
7945b5a805 colors 2019-02-25 00:15:39 +01:00