RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 01:55:38 +08:00
Code Issues Projects Releases Packages Wiki Activity
4901 commits 3 branches 14 tags 86 MiB
Commit graph

4901 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philippe Teuwen
581043bc90 Look for aidlist.json in the client dir 2019-03-05 20:33:18 +01:00
Iceman
402a442956
Merge pull request #113 from doegox/master 
Add missing i2c init in sc upgrade
 2019-03-05 19:52:57 +01:00
Philippe Teuwen
2e884db100 Add missing i2c init in sc upgrade 2019-03-05 19:44:02 +01:00
Oleg Moiseenko
8302751db7
Merge pull request #112 from merlokk/ndef_tlv 
Ndef reading for and mfp
 2019-03-05 19:58:28 +02:00
merlokk
2e8771d7a3 added hf mf ndef 2019-03-05 19:57:08 +02:00
Iceman
0379c20031
Merge pull request #111 from doegox/master 
Fix return code check for iso14443b_select_card in hf epa
 2019-03-05 18:43:23 +01:00
merlokk
53e0d03098 ndef cert right decode. 
https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py
 2019-03-05 19:41:50 +02:00
merlokk
04a6a63427 rename 2019-03-05 18:43:12 +02:00
merlokk
581fe408ba ndef sig decoding 2019-03-05 18:14:30 +02:00
merlokk
a2be59db25 URI decode 2019-03-05 17:50:51 +02:00
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