From ad74cb3af2a286d54d81dedde44dee63fc5053e9 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Fri, 14 Jun 2024 15:24:39 -0700 Subject: [PATCH 1/4] Parse script: check for unexpected data in known blank areas --- parse.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/parse.py b/parse.py index 9ffbc9f..7aa3c95 100644 --- a/parse.py +++ b/parse.py @@ -87,10 +87,12 @@ class Tag(): self.filename = filename self.blocks = list(data[0+i:BYTES_PER_BLOCK+i] for i in range(0, len(data), BYTES_PER_BLOCK)) + self.warnings = [] + # Check for blank blocks for bi in IMPORTANT_BLOCKS: if self.blocks[bi] == b'\x00' * BYTES_PER_BLOCK: - print(f"Warning! Block {bi} is blank!") + self.warnings.append(f"Block {bi} is blank!") # Parse the data self.data = { @@ -118,9 +120,26 @@ class Tag(): "production_date": bytes_to_date(self.blocks[12]), "unknown": bytes_to_string(self.blocks[13]), # Appears to be some sort of date -- on some tags, this is identical to the production date, but not always - } + # Check for any data in bits that are expected to be blank + expected_to_be_blank = { + 5: [*range(6,8),*range(12,16)], + 6: range(12,16), + 10: [*range(0,4), *range(6,16)], + 14: [*range(0,4), *range(6,16)] + } + for block in range(16,39): + if block % 4 == 3: + continue # Skip MIFARE encryption key blocks + expected_to_be_blank[block] = list(range(0,16)) + + for block in expected_to_be_blank: + for pos in expected_to_be_blank[block]: + byte = self.blocks[block][pos] + if byte != 0: + self.warnings.append(f"Data found in block {block}, position {pos} that was expected to be blank (received {byte})") + def __str__(self, blocks_to_output = IMPORTANT_BLOCKS): result = "" @@ -132,6 +151,11 @@ class Tag(): else: result += f"- {key}: {bytes_to_hex(self.data[key]) if type(self.data[key]) == bytes else self.data[key]}\n" + if len(self.warnings): + result += "- Warnings:\n" + for warning in self.warnings: + result += f" - {warning}\n" + return result[:-1] def print_blocks(self, blocks_to_output = IMPORTANT_BLOCKS): From 79d9e3004d31e26f05dbb14c827dae3b8e5fbae1 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Fri, 14 Jun 2024 21:00:51 -0700 Subject: [PATCH 2/4] Fix bytes_to_hex --- parse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse.py b/parse.py index 7aa3c95..9d306ae 100644 --- a/parse.py +++ b/parse.py @@ -21,7 +21,7 @@ def bytes_to_string(data): def bytes_to_hex(data, chunkify = False): output = data.hex().upper() - return " ".join((string[0+i:2+i] for i in range(0, len(string), 2))) if chunkify else output + return " ".join((output[0+i:2+i] for i in range(0, len(output), 2))) if chunkify else output def bytes_to_int(data): return int.from_bytes(data, 'little') From 9d1eb4ab64bd9d3cd57f23189c8a0b58937afbe0 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Fri, 14 Jun 2024 21:01:58 -0700 Subject: [PATCH 3/4] Block 16 has data now --- parse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse.py b/parse.py index 9d306ae..1750fd7 100644 --- a/parse.py +++ b/parse.py @@ -129,7 +129,7 @@ class Tag(): 10: [*range(0,4), *range(6,16)], 14: [*range(0,4), *range(6,16)] } - for block in range(16,39): + for block in range(17,39): if block % 4 == 3: continue # Skip MIFARE encryption key blocks expected_to_be_blank[block] = list(range(0,16)) From 930c45927bc6968ff004c76a94bbb57bff8d36ed Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Fri, 14 Jun 2024 21:13:38 -0700 Subject: [PATCH 4/4] Block 17 has some data --- parse.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/parse.py b/parse.py index 1750fd7..09393c9 100644 --- a/parse.py +++ b/parse.py @@ -127,9 +127,10 @@ class Tag(): 5: [*range(6,8),*range(12,16)], 6: range(12,16), 10: [*range(0,4), *range(6,16)], - 14: [*range(0,4), *range(6,16)] + 14: [*range(0,4), *range(6,16)], + 17: range(2,16) } - for block in range(17,39): + for block in range(18,39): if block % 4 == 3: continue # Skip MIFARE encryption key blocks expected_to_be_blank[block] = list(range(0,16))