X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/654b6ae3f4bf56bc210022b603edbb1575e05dff..e0991f6aa7bf7b193080855bb818ce193542c6dc:/client/emv/tlv.c

diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index 776fdeed..35bdb5d4 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -92,16 +92,15 @@ static size_t tlv_parse_len(const unsigned char **buf, size_t *len)
 		return l;
 
 	size_t ll = l &~ TLV_LEN_LONG;
-	if (*len < ll)
+	if (ll > 5)
 		return TLV_LEN_INVALID;
 
-	/* FIXME */
-	if (ll != 1)
-		return TLV_LEN_INVALID;
-
-	l = **buf;
-	--*len;
-	++*buf;
+	l = 0;
+	for (int i = 1; i <= ll; i++) {
+		l = (l << 8) + **buf;
+		--*len;
+		++*buf;
+	}
 
 	return l;
 }
@@ -458,6 +457,10 @@ const struct tlv *tlvdb_get_inchild(const struct tlvdb *tlvdb, tlv_tag_t tag, co
 	return tlvdb_get(tlvdb, tag, prev);
 }
 
+const struct tlv *tlvdb_get_tlv(const struct tlvdb *tlvdb) {
+	return &tlvdb->tag;
+}
+
 unsigned char *tlv_encode(const struct tlv *tlv, size_t *len)
 {
 	size_t size = tlv->len;
@@ -516,3 +519,18 @@ bool tlv_equal(const struct tlv *a, const struct tlv *b)
 
 	return a->tag == b->tag && a->len == b->len && !memcmp(a->value, b->value, a->len);
 }
+
+struct tlvdb *tlvdb_elm_get_next(struct tlvdb *tlvdb)
+{
+	return tlvdb->next;
+}
+
+struct tlvdb *tlvdb_elm_get_children(struct tlvdb *tlvdb)
+{
+	return tlvdb->children;
+}
+
+struct tlvdb *tlvdb_elm_get_parent(struct tlvdb *tlvdb)
+{
+	return tlvdb->parent;
+}