Update from xpwn: base64 functionality moved from dmg to common

(cherry picked from commit b1dcb38657f80d662ab44abd686693b97cf4ee79)

common/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_library(common abstractfile.c)
+add_library(common abstractfile.c base64.c)
 

dmg/CMakeLists.txt

@@ -16,7 +16,7 @@ link_directories(${ZLIB_LIBRARIES})
 
 link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs)
 
-add_library(dmg adc.c base64.c checksum.c dmgfile.c dmglib.c filevault.c io.c partition.c resources.c udif.c)
+add_library(dmg adc.c checksum.c dmgfile.c dmglib.c filevault.c io.c partition.c resources.c udif.c)
 
 IF(OPENSSL_FOUND)
 	add_definitions(-DHAVE_CRYPT)

includes/common.h

@@ -99,4 +99,10 @@ typedef struct io_func_struct {
   closeFunc close;
 } io_func;
 
+struct AbstractFile;
+
+unsigned char* decodeBase64(char* toDecode, size_t* dataLength);
+void writeBase64(struct AbstractFile* file, unsigned char* data, size_t dataLength, int tabLength, int width);
+char* convertBase64(unsigned char* data, size_t dataLength, int tabLength, int width);
+
 #endif

includes/dmg/dmg.h

@@ -277,10 +277,6 @@ extern "C" {
 #endif
 	void outResources(AbstractFile* file, AbstractFile* out);
 
-	unsigned char* decodeBase64(char* toDecode, size_t* dataLength);
-	void writeBase64(AbstractFile* file, unsigned char* data, size_t dataLength, int tabLength, int width);
-	char* convertBase64(unsigned char* data, size_t dataLength, int tabLength, int width);
-
 	uint32_t CRC32Checksum(uint32_t* crc, const unsigned char *buf, size_t len);
 	uint32_t MKBlockChecksum(uint32_t* ckSum, const unsigned char* data, size_t len);