Merge branch 'martin'

1 files changed, 41 insertions, 30 deletions

diff --git a/src/img3.h b/src/img3.h
index a19ae99..cb042b5 100644
--- a/src/img3.h
+++ b/src/img3.h
@@ -19,43 +19,48 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef IMG3_H
-#define IMG3_H
+#ifndef IDEVICERESTORE_IMG3_H
+#define IDEVICERESTORE_IMG3_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef enum {
-    kNorContainer  = 0x696D6733, // img3
-    kImg3Container = 0x496D6733, // Img3
-    k8900Container = 0x30303938, // 8900
-    kImg2Container = 0x494D4732  // IMG2
+	kNorContainer = 0x696D6733,  // img3
+	kImg3Container = 0x496D6733, // Img3
+	k8900Container = 0x30303938, // 8900
+	kImg2Container = 0x494D4732  // IMG2
 } img3_container;
 
 typedef enum {
-    kDataElement = 0x44415441, // DATA
-    kTypeElement = 0x54595045, // TYPE
-    kKbagElement = 0x4B424147, // KBAG
-    kShshElement = 0x53485348, // SHSH
-    kCertElement = 0x43455254, // CERT
-    kChipElement = 0x43484950, // CHIP
-    kProdElement = 0x50524F44, // PROD
-    kSdomElement = 0x53444F4D, // SDOM
-    kVersElement = 0x56455253, // VERS
-    kBordElement = 0x424F5244, // BORD
-    kSepoElement = 0x5345504F, // SEPO
-    kEcidElement = 0x45434944  // ECID
+	kDataElement = 0x44415441, // DATA
+	kTypeElement = 0x54595045, // TYPE
+	kKbagElement = 0x4B424147, // KBAG
+	kShshElement = 0x53485348, // SHSH
+	kCertElement = 0x43455254, // CERT
+	kChipElement = 0x43484950, // CHIP
+	kProdElement = 0x50524F44, // PROD
+	kSdomElement = 0x53444F4D, // SDOM
+	kVersElement = 0x56455253, // VERS
+	kBordElement = 0x424F5244, // BORD
+	kSepoElement = 0x5345504F, // SEPO
+	kEcidElement = 0x45434944, // ECID
+	kUnknElement = 0x53414c54  // FIXME
 } img3_element_type;
 
 typedef struct {
-    unsigned int signature;
-    unsigned int full_size;
-    unsigned int data_size;
-    unsigned int shsh_offset;
-    unsigned int image_type;
+	unsigned int signature;
+	unsigned int full_size;
+	unsigned int data_size;
+	unsigned int shsh_offset;
+	unsigned int image_type;
 } img3_header;
 
 typedef struct {
-    unsigned int signature;
-    unsigned int full_size;
-    unsigned int data_size;
+	unsigned int signature;
+	unsigned int full_size;
+	unsigned int data_size;
 } img3_element_header;
 
 typedef struct {
@@ -77,13 +82,19 @@ typedef struct {
 	img3_element* ecid_element;
 	img3_element* shsh_element;
 	img3_element* cert_element;
+	img3_element* unkn_element;
 } img3_file;
 
-img3_file* img3_parse_file(char* data, int size);
-img3_element* img3_parse_element(char* data);
-int img3_replace_signature(img3_file* image, char* signature);
 void img3_free(img3_file* image);
-int img3_get_data(img3_file* image, char** pdata, int* psize);
+img3_element* img3_parse_element(char* data);
 void img3_free_element(img3_element* element);
+img3_file* img3_parse_file(char* data, int size);
+int img3_get_data(img3_file* image, char** pdata, int* psize);
+int img3_replace_signature(img3_file* image, char* signature);
+
+
+#ifdef __cplusplus
+}s
+#endif
 
 #endif