dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #635 from merlokk/ndef_tlv

Browse Source 
added some ndef tlv types
This commit is contained in:
Oleg Moiseenko
2020-04-02 18:43:00 +03:00
committed by GitHub
parent 16110985ca e64e5fb65c
commit 2d31a3a22d
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/mifare/ndef.c
View File

@@ -422,6 +422,7 @@ int NDEFRecordsDecodeAndPrint(uint8_t *ndefRecord, size_t ndefRecordLen) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
// http://apps4android.org/nfc-specifications/NFCForum-TS-Type-2-Tag_1.1.pdf
int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) { int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
size_t indx = 0; size_t indx = 0;
@@ -442,6 +443,24 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
indx += len; indx += len;
break; break;
} }
case 0x01: {
indx++;
uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
PrintAndLogEx(INFO, "-- NDEF Lock Control.");
if (len != 3)
PrintAndLogEx(WARNING, "NDEF Lock Control block size must be 3 instead of %d.", len);
indx += len;
break;
}
case 0x02: {
indx++;
uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
PrintAndLogEx(INFO, "-- NDEF Memory Control.");
if (len != 3)
PrintAndLogEx(WARNING, "NDEF Memory Control block size must be 3 instead of %d.", len);
indx += len;
break;
}
case 0x03: { case 0x03: {
indx++; indx++;
uint16_t len = ndefTLVGetLength(&ndef[indx], &indx); uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);