From 98dbed09bad42f3eb4bda194b7032548b8fbbfd6 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 04:23:55 -0700 Subject: [PATCH 1/8] Restructure block data section (and add additional info) --- README.md | 219 +++++++++++++++++++++++++++--------------------------- 1 file changed, 111 insertions(+), 108 deletions(-) diff --git a/README.md b/README.md index e5bc8ac..7d030e1 100644 --- a/README.md +++ b/README.md @@ -249,62 +249,64 @@ If you place the Proxmark in between the AMS reader and the spool, make sure tha ``` [+] saved 1024 bytes to binary file /Users/mitch/hf-mf-75066B1D-dump.bin ``` - - ## Tag Documentation -This contains documentation for the known and unknown data that is contained in each block on the RFID tag. -### Block Overview -Summary of what kind of data is stored in each block. Detailed info for each block is documented below. -| sec | blk | Data | -|-----|-----|----------------------------------------------------------------------------------------| -| 0 | 0 | [Block 0](#block-0) UID and Tag Manufacturer Data | -| 0 | 1 | [Block 1](#block-1) Tray Info Index | -| 0 | 2 | [Block 2](#block-2) Filament Type | -| 0 | 3 | [Block 3](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 1 | 0 | [Block 4](#block-4) Detailed Filament Type | -| 1 | 1 | [Block 5](#block-5) Spool Weight, Color Code | -| 1 | 2 | [Block 6](#block-6) Min/Max Hotend, Bed Temp, Bed Temp Type, Drying Time, Drying Temp | -| 1 | 3 | [Block 7](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 2 | 0 | [Block 8](#block-8) X Cam Info | -| 2 | 1 | [Block 9](#block-9) Tray UID | -| 2 | 2 | [Block 10](#block-10) **Unknown** | -| 2 | 3 | [Block 11](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 3 | 0 | [Block 12](#block-12) Production Date/Time | -| 3 | 1 | [Block 13](#block-13) **Unknown** | -| 3 | 2 | [Block 14](#block-14) **Unknown** | -| 3 | 3 | [Block 15](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 4 | 0 | **Empty** | -| 4 | 1 | **Empty** | -| 4 | 2 | **Empty** | -| 4 | 3 | [Block 19](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 5 | 0 | **Empty** | -| 5 | 1 | **Empty** | -| 5 | 2 | **Empty** | -| 5 | 3 | [Block 23](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 6 | 0 | **Empty** | -| 6 | 1 | **Empty** | -| 6 | 2 | **Empty** | -| 6 | 3 | [Block 27](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 7 | 0 | **Empty** | -| 7 | 1 | **Empty** | -| 7 | 2 | **Empty** | -| 7 | 3 | [Block 31](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 8 | 0 | **Empty** | -| 8 | 1 | **Empty** | -| 8 | 2 | **Empty** | -| 8 | 3 | [Block 35](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 9 | 0 | **Empty** | -| 9 | 1 | **Empty** | -| 9 | 2 | **Empty** | -| 9 | 3 | [Block 39](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | -| 10-15 | * | **RSA-2048 Signature** | +This contains documentation for the known and unknown data that is contained in each block on the RFID tag. + +### Block Overview + +Summary of what kind of data is stored in each block. Detailed info for each block is documented below. +| sec | blk | Data | +|-----|-----|----------------------------------------------------------------------------------------| +| 0 | 0 | [Block 0](#block-0) UID and Tag Manufacturer Data | +| 0 | 1 | [Block 1](#block-1) Tray Info Index | +| 0 | 2 | [Block 2](#block-2) Filament Type | +| 0 | 3 | [Block 3](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 1 | 0 | [Block 4](#block-4) Detailed Filament Type | +| 1 | 1 | [Block 5](#block-5) Spool Weight, Color Code | +| 1 | 2 | [Block 6](#block-6) Min/Max Hotend, Bed Temp, Bed Temp Type, Drying Time, Drying Temp | +| 1 | 3 | [Block 7](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 2 | 0 | [Block 8](#block-8) X Cam Info | +| 2 | 1 | [Block 9](#block-9) Tray UID | +| 2 | 2 | [Block 10](#block-10) **Unknown** | +| 2 | 3 | [Block 11](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 3 | 0 | [Block 12](#block-12) Production Date/Time | +| 3 | 1 | [Block 13](#block-13) **Unknown** | +| 3 | 2 | [Block 14](#block-14) **Unknown** | +| 3 | 3 | [Block 15](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 4 | 0 | **Empty** | +| 4 | 1 | **Empty** | +| 4 | 2 | **Empty** | +| 4 | 3 | [Block 19](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 5 | 0 | **Empty** | +| 5 | 1 | **Empty** | +| 5 | 2 | **Empty** | +| 5 | 3 | [Block 23](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 6 | 0 | **Empty** | +| 6 | 1 | **Empty** | +| 6 | 2 | **Empty** | +| 6 | 3 | [Block 27](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 7 | 0 | **Empty** | +| 7 | 1 | **Empty** | +| 7 | 2 | **Empty** | +| 7 | 3 | [Block 31](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 8 | 0 | **Empty** | +| 8 | 1 | **Empty** | +| 8 | 2 | **Empty** | +| 8 | 3 | [Block 35](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 9 | 0 | **Empty** | +| 9 | 1 | **Empty** | +| 9 | 2 | **Empty** | +| 9 | 3 | [Block 39](#mifare-encryption-keys) MIFARE encryption keys, Unrelated to BambuLab | +| 10-15 | \* | **RSA-2048 Signature** | The first part of the filament serial number seems to be the Tag UID. -LE = Little Endian +> [!NOTE] +> All numbers are encoded as Little Endian (LE). ### MIFARE Encryption Keys + Every 4th block (eg Sector X, Block 3) contains encryption keys that are part of the MIFARE RFID standard. This has nothing to do with BambuLab's memory format. All BambuLab tags use the same Permission Bits (Access Control) @@ -312,11 +314,11 @@ All BambuLab tags use the same Permission Bits (Access Control) Example Data: `AA AA AA AA AA AA PP PP PP PP BB BB BB BB BB BB` -| bytes | type | example data location | Description | -|---------|----------|--------------------------|-----------------------------------------------| -| 5-0 | RAW Bin | AA AA AA AA AA AA | A-Key | -| 9-6 | RAW Bin | PP PP PP PP | Permission Bits (Access Control)
ALWAYS `87 87 87 69` (hex) for Bambu Tags | -| 15-10 | RAW Bin | BB BB BB BB BB BB | B-Key (always `00 00 00 00 00 00` for Bambu tags) | +| position | length | type | Description | +| -------- | ------ | ------- | ------------------------------------------------------------------------------ | +| 0 (AA) | 6 | RAW Bin | A-Key | +| 6 (PP) | 4 | RAW Bin | Permission Bits (Access Control)
ALWAYS `87 87 87 69` (hex) for Bambu Tags | +| 10 (BB) | 6 | RAW Bin | B-Key (always `00 00 00 00 00 00` for Bambu tags) | ### Block 0 @@ -325,125 +327,126 @@ Note: Block 0 is Read-only. The contents are set by the tag manufacturer. Example Data: `AA AA AA AA BB BB BB BB BB BB BB BB BB BB BB BB` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------|-----------------------------------------------| -| 7-0 | string | AA AA AA AA | Tag UID | -| 15-8 | string | BB BB BB BB BB BB BB BB BB BB BB BB | Tag Manufacturer Data (Bin) | +| position | length | type | Description | +| -------- | ------ | ------- | --------------------- | +| 0 (AA) | 4 | string | Tag UID | +| 4 (BB) | 12 | RAW Bin | Tag Manufacturer Data | ### Block 1 Example Data: `AA AA AA AA AA AA AA AA BB BB BB BB BB BB BB BB` -| bytes | type | example data location | Description | -|-------|----------|--------------------------|-----------------------------------------------| -| 7-0 | string | BB BB BB BB BB BB BB BB | Tray Info Index - Unique Material Identifier | -| 15-8 | string | AA AA AA AA AA AA AA AA | **Unkown** | +| position | length | type | Description | +| -------- | ------ | ------ | --------------------------------------------- | +| 0 (AA) | 8 | string | Tray Info Index - Material Variant Identifier | +| 8 (BB) | 16 | string | Tray Info Index - Unique Material Identifier | ### Block 2 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|-----------------------------------| -| 15-0 | string | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | Filament type | - +| position | length | type | Description | +| -------- | ------ | ------ | ------------- | +| 0 (AA) | 16 | string | Filament Type | ### Block 4 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` -| bytes | type | example data location |description | -|-------|----------|-------------------------------------------------|---------------------------------| -| 15-0 | string | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | detailed Filament type | +| position | length | type | description | +| -------- | ------ | ------ | ---------------------- | +| 0 (AA) | 16 | string | Detailed Filament Type | Known Values: + - PLA Basic +- PLA Tough +- Support for PLA +- PLA-CF +- PETG Basic ### Block 5 Example Data: -`AA AA AA AA BB BB CC CC CC CC CC CC CC CC CC CC` +`AA AA AA AA BB BB __ __ CC CC CC CC __ __ __ __` -| bytes | type | example data location | Description | -|-------|----------------|--------------------------------|-----------------------------------------------| -| 9-0 | **Unkown** | CC CC CC CC CC CC CC CC CC CC | **Unkown** | -| 11-10 | uint16 (LE) | BB BB | Spool Weight in g HEX: E803 --> 1000 g | -| 15-12 | RGBA in HEX | AA AA AA AA | Color in hex RBGA | +| position | length | type | Description | +| -------- | ------ | ----------- | -------------------------------------------- | +| 0 (AA) | 4 | RGBA | Color in hex RBGA | +| 4 (BB) | 2 | uint16 (LE) | Spool Weight in grams (`E8 03` --> 1000 g) | +| 8 (CC) | 8 | float (LE) | Filament Diameter in milimeters | ### Block 6 Example Data: -`AA AA BB BB CC CC DD DD EE EE FF FF GG GG GG GG` - -| bytes | type | example data location | Description | -|-------|---------------|--------------------------|-----------------------------------------------| -| 3-0 | **Unused?** | GG GG GG GG | **Unkown** | -| 5-4 | uint16 (LE) | FF FF | Min- or Maxtemperature for Hotend | -| 7-6 | uint16 (LE) | EE EE | Min- or Maxtemperature for Hotend | -| 9-8 | uint16 (LE) | DD DD | Bed Temperatur in °C | -| 11-10 | uint16 (LE) | CC CC | Bed Temerature Type | -| 13-12 | uint16 (LE) | BB BB | Drying time in h | -| 15-14 | uint16 (LE) | AA AA | Drying temp in °C | +`AA AA BB BB CC CC DD DD EE EE FF FF __ __ __ __` +| position | length | type | Description | +| -------- | ------ | ----------- | --------------------------------- | +| 0 (AA) | 2 | uint16 (LE) | Drying temp in °C | +| 2 (BB) | 2 | uint16 (LE) | Drying time in h | +| 4 (CC) | 4 | uint16 (LE) | Bed Temerature Type | +| 6 (DD) | 2 | uint16 (LE) | Bed Temperatur in °C | +| 8 (EE) | 2 | uint16 (LE) | Min- or Maxtemperature for Hotend | +| 10 (FF) | 2 | uint16 (LE) | Min- or Maxtemperature for Hotend | ### Block 8 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA BB BB BB BB` -| bytes | type | example data location |description | -|-------|------------|-------------------------------------|---------------------------------| -| 3-0 | **Unkown** | BB BB BB BB | **Unkown** | -| 15-4 | RAW Bin | AA AA AA AA AA AA AA AA AA AA AA AA | X Cam info | +| position | length | type | description | +| -------- | ------ | ---------- | ----------------------- | +| 0 (AA) | 12 | RAW Bin | X Cam info | +| 12 (BB) | 4 | float (LE) | **Nozzle Diameter...?** | ### Block 9 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|-----------------------------------| -| 15-0 | UID | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | TrayUID | +| position | length | type | Description | +| -------- | ------ | ------ | ----------- | +| 0 (AA) | 16 | string | Tray UID | ### Block 10 Example Data: -`AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` +`__ __ __ __ AA AA __ __ __ __ __ __ __ __ __ __` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|-----------------------------------| -| 15-0 | Unknown | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | **Unknown** (binary data) | +| position | length | type | Description | +| -------- | ------ | ------- | ------------------------- | +| 4 (AA) | 2 | uint16 (LE) | Spool Width in µm (`E1 19` --> 6625µm --> 66.25mm ) | ### Block 12 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|----------------------------------------| -| 15-0 | string | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | Production Date and Time in ASCII ? `____` | +| position | length | type | Description | +| -------- | ------ | ------ | -------------------------------------------------------------------------- | +| 0 (AA) | 16 | string | Production Date and Time in ASCII (`____`) | ### Block 13 Example Data: `AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|-----------------------------------| -| 15-0 | Unknown | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | **Unknown** (ASCII data) | +| position | length | type | Description | +| -------- | ------ | ------ | ---------------------------------- | +| 0 (AA) | 16 | string | **Short Production Date/Time...?** | ### Block 14 Example Data: -`AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA` - -| bytes | type | example data location | Description | -|-------|----------|-------------------------------------------------|-----------------------------------| -| 15-0 | Unknown | AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA AA | **Unknown** (binary data) | +`__ __ __ __ AA AA __ __ __ __ __ __ __ __ __ __` +| position | length | type | Description | +| -------- | ------ | ----------- | --------------------------------- | +| 4 (AA) | 2 | uint16 (LE) | **Filament length in meters...?** | ## Compatible RFID tags - By generation From 1b6615321724e767b043c29ef3382c1b33c6fe1d Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 04:30:49 -0700 Subject: [PATCH 2/8] Update data for block 6 --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7d030e1..25edfd8 100644 --- a/README.md +++ b/README.md @@ -384,14 +384,14 @@ Example Data: Example Data: `AA AA BB BB CC CC DD DD EE EE FF FF __ __ __ __` -| position | length | type | Description | -| -------- | ------ | ----------- | --------------------------------- | -| 0 (AA) | 2 | uint16 (LE) | Drying temp in °C | -| 2 (BB) | 2 | uint16 (LE) | Drying time in h | -| 4 (CC) | 4 | uint16 (LE) | Bed Temerature Type | -| 6 (DD) | 2 | uint16 (LE) | Bed Temperatur in °C | -| 8 (EE) | 2 | uint16 (LE) | Min- or Maxtemperature for Hotend | -| 10 (FF) | 2 | uint16 (LE) | Min- or Maxtemperature for Hotend | +| position | length | type | Description | +| -------- | ------ | ----------- | --------------------------------------- | +| 0 (AA) | 2 | uint16 (LE) | Drying Temperature in °C | +| 2 (BB) | 2 | uint16 (LE) | Drying time in hours | +| 4 (CC) | 4 | uint16 (LE) | Bed Temerature Type **(types unknown)** | +| 6 (DD) | 2 | uint16 (LE) | Bed Temperature in °C | +| 8 (EE) | 2 | uint16 (LE) | Min Temperature for Hotend in °C | +| 10 (FF) | 2 | uint16 (LE) | Max Temperature for Hotend in °C | ### Block 8 From 54235bb66ddc39436361ae747692f33da660da93 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 04:33:13 -0700 Subject: [PATCH 3/8] Add parsing script --- parse.py | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 parse.py diff --git a/parse.py b/parse.py new file mode 100644 index 0000000..8510585 --- /dev/null +++ b/parse.py @@ -0,0 +1,142 @@ +# -*- coding: utf-8 -*- + +# Python script to parse Bambu Lab RFID tag data +# Created for https://github.com/Bambu-Research-Group/RFID-Tag-Guide +# Written by Vinyl Da.i'gyu-Kazotetsu (www.queengoob.org), 2024 + +import sys +import struct +from datetime import datetime + +COMPARISON_BLOCKS = [1, 2, 4, 5, 6, 8, 9, 10, 12, 13, 14] +IMPORTANT_BLOCKS = [0] + COMPARISON_BLOCKS + +BYTES_PER_BLOCK = 16 +BLOCKS_PER_TAG = 64 +TOTAL_BYTES = BLOCKS_PER_TAG * BYTES_PER_BLOCK + +# Byte conversions +def bytes_to_string(data): + return data.decode('ascii').replace('\x00', ' ').strip() + +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 + +def bytes_to_int(data): + return int.from_bytes(data, 'little') + +def bytes_to_float(data): + return struct.unpack(' 0: + tag.compare(data[i-1]) + print() + +if __name__ == "__main__": + data = load_data(sys.argv[1:]) + print_data(data, False) From 02c7103d2d0cdcea3e0512ca37edb9e3252f939f Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 05:05:16 -0700 Subject: [PATCH 4/8] Add Unit class --- parse.py | 58 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/parse.py b/parse.py index 8510585..b67ac7b 100644 --- a/parse.py +++ b/parse.py @@ -48,6 +48,37 @@ class TagLengthMismatchError(TypeError): def __init__(self, actual_length): super().__init__(f"The data does not appear to be a valid MIFARE 1K RFID tag (received {actual_length} bytes / {int(actual_length / BYTES_PER_BLOCK)} blocks, expected {TOTAL_BYTES} bytes / {BLOCKS_PER_TAG} blocks).") +class Unit(): + def __init__(self, value, unit): + self.value = value + self.unit = unit + + def __str__(self): + return str(self.value) + ("º" if self.unit in ["C", "F"] else "") + self.unit + + def __get_comparison_values(self, other): + if type(other) in [int, float]: + return [self.value, other] + if type(other) != Unit: + raise TypeError(f"Type {type(other)} cannot be compared with type Unit") + if self.unit != other.unit: + raise TypeError(f"Unit type {other.unit} is not identical to {self.unit}") + return [self.value, other.value] + + def __eq__(self, other): + values = self.__get_comparison_values(self, other) + return values[0] == values[1] + + def __lt__(self, other): + values = self.__get_comparison_values(self, other) + return values[0] < values[1] + + def __gt__(self, other): + values = self.__get_comparison_values(self, other) + return values[0] > values[1] + +print(type(Unit(1, "g"))) + class Tag(): def __init__(self, filename, data): # Check to make sure the data is 1KB @@ -64,20 +95,20 @@ class Tag(): "filament_type": bytes_to_string(self.blocks[2]), "detailed_filament_type": bytes_to_string(self.blocks[4]), "color": "#" + bytes_to_hex(self.blocks[5][0:4]), - "weight": bytes_to_int(self.blocks[5][4:6]), # in g (grams) - "length": bytes_to_int(self.blocks[14][4:6]), # in m (meters) - "diameter": bytes_to_float(self.blocks[5][8:12]), # in mm (meters) - "spool_width": bytes_to_int(self.blocks[10][4:6]) / 100, # in mm (meters) + "weight": Unit(bytes_to_int(self.blocks[5][4:6]), "g"), + "length": Unit(bytes_to_int(self.blocks[14][4:6]), "m"), + "diameter": Unit(bytes_to_float(self.blocks[5][8:12]), "mm"), + "spool_width": Unit(bytes_to_int(self.blocks[10][4:6]) / 100, "mm"), "material_id": bytes_to_string(self.blocks[1][8:16]), "variant_id": bytes_to_string(self.blocks[1][0:8]), - "nozzle_diameter": bytes_to_float(self.blocks[8][12:16]), # in mm (meters) + "nozzle_diameter": Unit(round(bytes_to_float(self.blocks[8][12:16]), 1), "mm"), "temperatures": { - "min_hotend": bytes_to_int(self.blocks[6][10:12]), # in C (Celsius) - "max_hotend": bytes_to_int(self.blocks[6][8:10]), # in C (Celsius) - "bed_temp": bytes_to_int(self.blocks[6][6:8]), # in C (Celsius) + "min_hotend": Unit(bytes_to_int(self.blocks[6][10:12]), "C"), + "max_hotend": Unit(bytes_to_int(self.blocks[6][8:10]), "C"), + "bed_temp": Unit(bytes_to_int(self.blocks[6][6:8]), "C"), "bed_temp_type": bytes_to_int(self.blocks[6][4:6]), - "drying_time": bytes_to_int(self.blocks[6][2:4]), # in hours - "drying_temp": bytes_to_int(self.blocks[6][0:2]), # in C (Celsius) + "drying_time": Unit(bytes_to_int(self.blocks[6][2:4]), "h"), + "drying_temp": Unit(bytes_to_int(self.blocks[6][0:2]), "C"), }, "x_cam_info": self.blocks[8][0:12], "tray_uid": self.blocks[9], @@ -91,7 +122,12 @@ class Tag(): result = "" for key in self.data: - result += f"- {key}: {bytes_to_hex(self.data[key]) if type(self.data[key]) == bytes else self.data[key]}\n" + if type(self.data[key]) == dict: + result += f"- {key}:\n" + for tkey in self.data[key]: + result += f" - {tkey}: {self.data[key][tkey]}\n" + else: + result += f"- {key}: {bytes_to_hex(self.data[key]) if type(self.data[key]) == bytes else self.data[key]}\n" return result[:-1] From eb6296699707bd597736e5a63d7df802d87c6c3f Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 06:13:53 -0700 Subject: [PATCH 5/8] Remove leftover debugging --- parse.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/parse.py b/parse.py index b67ac7b..3ba860a 100644 --- a/parse.py +++ b/parse.py @@ -77,8 +77,6 @@ class Unit(): values = self.__get_comparison_values(self, other) return values[0] > values[1] -print(type(Unit(1, "g"))) - class Tag(): def __init__(self, filename, data): # Check to make sure the data is 1KB From ca83aec1e997685ab059d8f57d989bc99c2f5f17 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 06:15:19 -0700 Subject: [PATCH 6/8] Change a few dictionary keys --- parse.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parse.py b/parse.py index 3ba860a..cd583b0 100644 --- a/parse.py +++ b/parse.py @@ -92,10 +92,10 @@ class Tag(): "uid": bytes_to_hex(self.blocks[0][0:4]), "filament_type": bytes_to_string(self.blocks[2]), "detailed_filament_type": bytes_to_string(self.blocks[4]), - "color": "#" + bytes_to_hex(self.blocks[5][0:4]), - "weight": Unit(bytes_to_int(self.blocks[5][4:6]), "g"), - "length": Unit(bytes_to_int(self.blocks[14][4:6]), "m"), - "diameter": Unit(bytes_to_float(self.blocks[5][8:12]), "mm"), + "filament_color": "#" + bytes_to_hex(self.blocks[5][0:4]), + "spool_weight": Unit(bytes_to_int(self.blocks[5][4:6]), "g"), + "filament_length": Unit(bytes_to_int(self.blocks[14][4:6]), "m"), + "filament_diameter": Unit(bytes_to_float(self.blocks[5][8:12]), "mm"), "spool_width": Unit(bytes_to_int(self.blocks[10][4:6]) / 100, "mm"), "material_id": bytes_to_string(self.blocks[1][8:16]), "variant_id": bytes_to_string(self.blocks[1][0:8]), From be70dd0f0de3e7bf33e9e51e5ffc47ea41d60f10 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Tue, 28 May 2024 06:41:05 -0700 Subject: [PATCH 7/8] Check if any blank blocks are present and warn the user if so --- parse.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parse.py b/parse.py index cd583b0..9ffbc9f 100644 --- a/parse.py +++ b/parse.py @@ -87,6 +87,11 @@ 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)) + # 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!") + # Parse the data self.data = { "uid": bytes_to_hex(self.blocks[0][0:4]), From 74736043b07d4a0b0a0693e045f9dd8c7912f9fd Mon Sep 17 00:00:00 2001 From: Mitch Davis Date: Tue, 28 May 2024 10:59:26 -0400 Subject: [PATCH 8/8] Added example dumps and keyfiles Used for anyone who wants to poke around with the data, but doesn't have the hardware to create their own dump --- examples/exampleDump.bin | Bin 0 -> 1024 bytes examples/exampleDump.json | 269 ++++++++++++++++++++++++++++++++++++ examples/exampleKeyfile.bin | Bin 0 -> 192 bytes 3 files changed, 269 insertions(+) create mode 100644 examples/exampleDump.bin create mode 100644 examples/exampleDump.json create mode 100644 examples/exampleKeyfile.bin diff --git a/examples/exampleDump.bin b/examples/exampleDump.bin new file mode 100644 index 0000000000000000000000000000000000000000..2ee574e216aeae2837c3fb6ed9c569095a405480 GIT binary patch literal 1024 zcmXTz$d>KqU}0c(w!9r3$2Gyxz(Cj0fPul?4aj0(UvS%;-(u>OUcuCb^gS^4&;3 zSiNn|jt5GYkiu`>`Vjww=#L`L+Hak?<&gXE(&J@<{EvlHz9%hxs!^odQTprLa{cp} zik4n;rO%5=PJ5vtc1!0c!hZgaE<5qYhUORRj}#?+R;&!{bX_`!qbH;3{#OU9{~l2} zB@+|tmO7{kJgD&JyPiMqO8;BqWCetN@uj_Li}y^u8tIld&2WwFR&mDXHq8p(uV49m zX+N8Xfl#}7g7Z=%Q--=spdhd0E rU%t=(Df9Hc-sW_Rh&N)$+z|L{LQl9?w)P?;t(`X;;@%XvBJ=|QyM6s3 literal 0 HcmV?d00001 diff --git a/examples/exampleDump.json b/examples/exampleDump.json new file mode 100644 index 0000000..80d1c63 --- /dev/null +++ b/examples/exampleDump.json @@ -0,0 +1,269 @@ +{ + "Created": "proxmark3", + "FileType": "mfc v2", + "Card": { + "UID": "75886B1D", + "ATQA": "0400", + "SAK": "08" + }, + "blocks": { + "0": "75886B1D8B080400034339DB5B5E0A90", + "1": "4130302D413000004746413030000000", + "2": "504C4100000000000000000000000000", + "3": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "4": "504C4120426173696300000000000000", + "5": "FF6A13FFFA0000000000E03F00000000", + "6": "3700080001002D00DC00DC0000000000", + "7": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "8": "8813100EE803E8039A99193FCDCC4C3E", + "9": "D7AC3B89A16B47C4B061728044E1F2D5", + "10": "00000000E11900000000000000000000", + "11": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "12": "323032325F31305F31355F30385F3236", + "13": "36303932323032000000000000000000", + "14": "00000000520000000000000000000000", + "15": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "16": "00000000000000000000000000000000", + "17": "00000000000000000000000000000000", + "18": "00000000000000000000000000000000", + "19": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "20": "00000000000000000000000000000000", + "21": "00000000000000000000000000000000", + "22": "00000000000000000000000000000000", + "23": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "24": "00000000000000000000000000000000", + "25": "00000000000000000000000000000000", + "26": "00000000000000000000000000000000", + "27": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "28": "00000000000000000000000000000000", + "29": "00000000000000000000000000000000", + "30": "00000000000000000000000000000000", + "31": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "32": "00000000000000000000000000000000", + "33": "00000000000000000000000000000000", + "34": "00000000000000000000000000000000", + "35": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "36": "00000000000000000000000000000000", + "37": "00000000000000000000000000000000", + "38": "00000000000000000000000000000000", + "39": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "40": "01CFDF394071DF7AC33C01793531B538", + "41": "4B0A3F1D24CBFD0E4D4A853D4D151519", + "42": "58CFDF394071DF7AC33C01793531B538", + "43": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "44": "4B0A3F1D24CBFD0E4D4A853D4D151519", + "45": "C062CF9B1A8AC8AC6A6C8A23B1DC3632", + "46": "EC8EABFC54D29247764D0ED867C17BB6", + "47": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "48": "AEAF544F605BF114E687DACCDA406DE1", + "49": "D2E3A6110FE31224F762A5E528722D88", + "50": "75FACEA72FCF6921394A9D1BCF161996", + "51": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "52": "0F888A3E17818083E8AFC47262F32179", + "53": "518945A59C088C6882DFF5403AFF485A", + "54": "6C7491617EA5402510E0784F0ED76F9E", + "55": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "56": "17A58D26A3BC95D559466E9631AC3DB5", + "57": "1701E73C8320F7D7D4F3D2BF064841EE", + "58": "8AA430A049C8ABF81FC604CE998DF497", + "59": "FFFFFFFFFFFF87878769FFFFFFFFFFFF", + "60": "A1F23E081A4231A9E8D1079BDA5EAB35", + "61": "DEEB804E6F4CFF949E2EF5DB0946585F", + "62": "320069B051FA908C574A6B2BA2322AB9", + "63": "FFFFFFFFFFFF87878769FFFFFFFFFFFF" + }, + "SectorKeys": { + "0": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block0": "read AB", + "block1": "read AB", + "block2": "read AB", + "block3": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "1": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block4": "read AB", + "block5": "read AB", + "block6": "read AB", + "block7": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "2": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block8": "read AB", + "block9": "read AB", + "block10": "read AB", + "block11": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "3": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block12": "read AB", + "block13": "read AB", + "block14": "read AB", + "block15": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "4": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block16": "read AB", + "block17": "read AB", + "block18": "read AB", + "block19": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "5": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block20": "read AB", + "block21": "read AB", + "block22": "read AB", + "block23": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "6": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block24": "read AB", + "block25": "read AB", + "block26": "read AB", + "block27": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "7": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block28": "read AB", + "block29": "read AB", + "block30": "read AB", + "block31": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "8": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block32": "read AB", + "block33": "read AB", + "block34": "read AB", + "block35": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "9": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block36": "read AB", + "block37": "read AB", + "block38": "read AB", + "block39": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "10": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block40": "read AB", + "block41": "read AB", + "block42": "read AB", + "block43": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "11": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block44": "read AB", + "block45": "read AB", + "block46": "read AB", + "block47": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "12": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block48": "read AB", + "block49": "read AB", + "block50": "read AB", + "block51": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "13": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block52": "read AB", + "block53": "read AB", + "block54": "read AB", + "block55": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "14": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block56": "read AB", + "block57": "read AB", + "block58": "read AB", + "block59": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + }, + "15": { + "KeyA": "FFFFFFFFFFFF", + "KeyB": "FFFFFFFFFFFF", + "AccessConditions": "87878769", + "AccessConditionsText": { + "block60": "read AB", + "block61": "read AB", + "block62": "read AB", + "block63": "read ACCESS by AB; write ACCESS by B", + "UserData": "69" + } + } + } +} \ No newline at end of file diff --git a/examples/exampleKeyfile.bin b/examples/exampleKeyfile.bin new file mode 100644 index 0000000000000000000000000000000000000000..063ffd912895a5999775c275c2e1ab40b0dc92d3 GIT binary patch literal 192 zcmd0c<~#Pj#^+^1nMOP}bMe0B=n2{CW+x-KYOIz$K0U{@dRdEhx=?H1#A)7!GuJH( zOEXuV#~``I;n^v{1DzASChh$(XU7AjOVeIxh~3ipd8PlYak4^O&a#X%M{hR7y(w^I HpfLad%9}2k literal 0 HcmV?d00001