Miscellaneous C99-compatible changes

include/config.h

@@ -11,7 +11,7 @@ typedef struct {
 	char *config_dir;
 	char *dest_dir;
 	int enableSignatureChecking;
-	bool noAutoUnsquashfs;
+	bool noAutoExtractFs;
 	bool signatureOnly;
 } config_opts_t;
 

include/epk.h

@@ -22,6 +22,7 @@ typedef enum {
 } BUILD_TYPE_T;
 
 typedef enum {
+	INVALID = -1,
     EPK,
 	EPK_V2,
 	EPK_V3,
@@ -39,7 +40,7 @@ typedef enum {
 #define EPKV1_VERSION_FORMAT "%02" PRIx8 ".%02" PRIx8 ".%02" PRIx8
 
 bool isEpkVersionString(const char *str);
-int wrap_verifyimage(void *signature, void *data, size_t signSize, char *config_dir, SIG_TYPE_T sigType);
-int wrap_decryptimage(void *src, size_t datalen, void *dest, char *config_dir, FILE_TYPE_T type, FILE_TYPE_T *outType);
+bool wrap_verifyimage(const void *signature, const void *data, size_t signSize, const char *config_dir, SIG_TYPE_T sigType);
+bool wrap_decryptimage(const void *src, size_t datalen, void *dest, const char *config_dir, FILE_TYPE_T type);
 void extractEPKfile(const char *epk_file, config_opts_t *config_opts);
 #endif

include/epk2.h

@@ -12,8 +12,8 @@
 #define EPK2_MAGIC "EPK2"
 #define PAK_MAGIC "MPAK"
 
-int compare_pak2_header(uint8_t *header, size_t headerSize);
-int compare_epk2_header(uint8_t *header, size_t headerSize);
+bool compare_pak2_header(const uint8_t *header, size_t headerSize);
+bool compare_epk2_header(const uint8_t *header, size_t headerSize);
 MFILE *isFileEPK2(const char *epk_file);
 void extractEPK2(MFILE *epk, config_opts_t *config_opts);
 

include/epk3.h

@@ -10,8 +10,8 @@
 
 #define EPK3_MAGIC "EPK3"
 
-int compare_epk3_header(uint8_t *header, size_t headerSize);
-int compare_epk3_new_header(uint8_t *header, size_t headerSize);
+bool compare_epk3_header(const uint8_t *header, size_t headerSize);
+bool compare_epk3_new_header(const uint8_t *header, size_t headerSize);
 MFILE *isFileEPK3(const char *epk_file);
 void extractEPK3(MFILE *epk, FILE_TYPE_T epkType, config_opts_t *config_opts);
 

include/main.h

@@ -6,5 +6,5 @@
 #ifndef __MAIN_H
 #define __MAIN_H
 #include "config.h"
-int handle_file(const char *file, config_opts_t *config_opts);
+int handle_file(const char *file, const config_opts_t *config_opts);
 #endif //__MAIN_H

include/mfile.h

@@ -61,7 +61,7 @@ typedef struct {
 	void *pMem;
 } MFILE;
 
-MFILE *mfile_new();
+MFILE *mfile_new(void);
 
 void *mfile_map(MFILE *file, size_t size);
 void *mfile_map_private(MFILE *file, size_t size);

include/util.h

@@ -46,7 +46,7 @@ void unnfsb(const char *filename, const char *extractedFile);
 MFILE *is_gzip(const char *filename);
 int is_jffs2(const char *filename);
 int isSTRfile(const char *filename);
-int isdatetime(const char *datetime);
+bool is_datetime(const char *datetime);
 int isPartPakfile(const char *filename);
 int is_kernel(const char *image_file);
 void extract_kernel(const char *image_file, const char *destination_file);

include/util_crypto.h

@@ -4,6 +4,8 @@
  */
 #ifndef __UTIL_CRYPTO_H
 #define __UTIL_CRYPTO_H
+#include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <openssl/aes.h>
 
@@ -15,14 +17,10 @@
 #define KEY_ECB (1 << 0)
 #define KEY_CBC (1 << 1)
 
-typedef int (*CompareFunc)(uint8_t *data, size_t size);
+typedef bool (*CompareFunc)(const uint8_t *data, size_t size);
 
-void setKeyFile(const char *keyFile);
-void setKeyFile_LG();
-void setKeyFile_MTK();
-
-uint8_t *getLastKey();
-uint8_t *getLastIV();
+void setKeyFile_LG(void);
+void setKeyFile_MTK(void);
 
 #define MAX_KEY_SIZE (AES_BLOCK_SIZE * 2) // AES-256
 
@@ -33,8 +31,8 @@ typedef struct {
 } KeyPair;
 
 KeyPair *find_AES_key(
-    uint8_t *in_data, size_t in_data_size, CompareFunc fCompare,
-    int key_type, void **dataOut, int verbose
+    const uint8_t *in_data, size_t in_data_size, CompareFunc fCompare,
+    int key_type, void **dataOut, bool verbose
 );
 
 #endif

src/cramfs/uncramfs.c

@@ -628,6 +628,11 @@ int is_cramfs_image(char const *imagefile, char *endian) {
 		perror(imagefile);
 		exit(1);
 	}
+
+	if (st.st_size < sizeof(struct cramfs_super)) {
+		return 0;
+	}
+
 	// Map the cramfs image
 	fd = open(imagefile, O_RDONLY);
 	fslen_ub = st.st_size;