From a2f8f0628c02c79cae965bbf35f5ab93fa7d83b0 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 5 Mar 2019 00:48:02 +0200
Subject: [PATCH] added ndef tlv parsing

---
 client/mifare/ndef.c | 58 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/client/mifare/ndef.c b/client/mifare/ndef.c
index 22deb0809..e5ce5fe11 100644
--- a/client/mifare/ndef.c
+++ b/client/mifare/ndef.c
@@ -9,8 +9,66 @@
 //-----------------------------------------------------------------------------
 
 #include "ndef.h"
+#include "ui.h"
+
+uint16_t ndefTLVGetLength(uint8_t *data, size_t *indx) {
+	uint16_t len = 0;
+	if (data[0] == 0xff) {
+		len = (data[1] << 8) + data[2];
+		*indx += 3;
+	} else {
+		len = data[0];
+		*indx += 1;
+	}
+	
+	return len;
+}
 
 int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) {
 	
+	size_t indx = 0;
+	
+	while (indx < ndefLen) {
+		switch (ndef[indx]) {
+			case 0x00: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF NULL block.");
+				if (len)
+					PrintAndLogEx(WARNING, "NDEF NULL block size must be 0 instead of %d.", len);
+				indx += len;
+				break;
+			}
+			case 0x03: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF message. len: %d", len);
+				
+				// ndef decode
+				
+				
+				
+				indx += len;
+				break;
+			}
+			case 0xfd: {
+				indx++;
+				uint16_t len = ndefTLVGetLength(&ndef[indx], &indx);
+				PrintAndLogEx(INFO, "NDEF proprietary info. Skipped %d bytes.", len);
+				indx += len;
+				break;
+			}
+			case 0xfe: {
+				PrintAndLogEx(INFO, "NDEF Terminator. Done.");
+				return 0;
+				break;
+			}
+			default: {
+				PrintAndLogEx(ERR, "unknown tag 0x%02x", ndef[indx]);
+				return 1;
+			}
+		}		
+	}
+	
 	return 0;
 }