From 99bc01c7770eb51fd85c371dc4389521f21fa9df Mon Sep 17 00:00:00 2001
From: yam-anssi <jeremy.richard@ssi.gouv.fr>
Date: Fri, 1 Jul 2016 10:28:29 +0200
Subject: [PATCH] cacheXXXX.bin header detection fixed.

---
 README.md    | 1 +
 bmc-tools.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5ef0e6c..48bd5fa 100644
--- a/README.md
+++ b/README.md
@@ -19,5 +19,6 @@ With the following arguments meaning:
 ```
 ## Changelog
 ```
+01/07/2016		1.00a	cacheXXXX.bin header detection fixed.
 27/06/2016		1.00	Initial release.
 ```
diff --git a/bmc-tools.py b/bmc-tools.py
index 112a7e1..28fa7ba 100755
--- a/bmc-tools.py
+++ b/bmc-tools.py
@@ -5,7 +5,7 @@
 from struct import pack, unpack
 
 class BMCContainer():
-	BIN_FILE_HEADER = "RDP8bmp\x00\x03\x00\x00\x00"
+	BIN_FILE_HEADER = "RDP8bmp\x00"
 	BIN_CONTAINER = ".BIN"
 	BMC_CONTAINER = ".BMC"
 	TILE_HEADER_SIZE = {BMC_CONTAINER: 0x14, BIN_CONTAINER: 0xC}
@@ -41,7 +41,8 @@ def b_import(self, fname):
 		self.fname = fname
 		self.btype = self.BMC_CONTAINER
 		if self.bdat[:len(self.BIN_FILE_HEADER)] == self.BIN_FILE_HEADER:
-			self.bdat = self.bdat[len(self.BIN_FILE_HEADER):]
+			self.b_log(sys.stdout, True, 2, "Subsequent header version: %d." % (unpack("<L", self.bdat[len(self.BIN_FILE_HEADER):len(self.BIN_FILE_HEADER)+4])[0]))
+			self.bdat = self.bdat[len(self.BIN_FILE_HEADER)+4:]
 			self.btype = self.BIN_CONTAINER
 		self.b_log(sys.stdout, True, 0, "Successfully loaded '%s' as a %s container." % (self.fname, self.btype))
 		return True