fork out plist stuff in libplist and migrate libiphone to use it.

8 files changed, 74 insertions, 1503 deletions

diff --git a/src/AFC.c b/src/AFC.c
index 899bd47..aefb971 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include "AFC.h"
-#include "plist.h"
 
 
 // This is the maximum size an AFC data packet can be
diff --git a/src/Makefile.am b/src/Makefile.am
index 82fd924..2514367 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/include
 
-AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g
-AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
+AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(libplist_CFLAGS) -g
+AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS)
 
 bin_PROGRAMS = libiphone-initconf
 
@@ -12,4 +12,4 @@ libiphone_initconf_LDFLAGS = $(libgthread2_LIBS) $(AM_LDFLAGS)
 
 
 lib_LTLIBRARIES = libiphone.la
-libiphone_la_SOURCES = usbmux.c iphone.c plist.c bplist.c xplist.c lockdown.c AFC.c userpref.c utils.c
+libiphone_la_SOURCES = usbmux.c iphone.c lockdown.c AFC.c userpref.c utils.c
diff --git a/src/bplist.c b/src/bplist.c
deleted file mode 100644
index a5b1c9b..0000000
--- a/src/bplist.c
+++ /dev/null
@@ -1,793 +0,0 @@
-/*
- * plist.c
- * Binary plist implementation
- *
- * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
-
-
-#include "plist.h"
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-/* Magic marker and size. */
-#define BPLIST_MAGIC		"bplist"
-#define BPLIST_MAGIC_SIZE	6
-
-#define BPLIST_VERSION		"00"
-#define BPLIST_VERSION_SIZE	2
-
-
-#define BPLIST_TRL_SIZE 	26
-#define BPLIST_TRL_OFFSIZE_IDX 	0
-#define BPLIST_TRL_PARMSIZE_IDX 1
-#define BPLIST_TRL_NUMOBJ_IDX 	2
-#define BPLIST_TRL_ROOTOBJ_IDX 	10
-#define BPLIST_TRL_OFFTAB_IDX 	18
-
-enum {
-	BPLIST_NULL = 0x00,
-	BPLIST_TRUE = 0x08,
-	BPLIST_FALSE = 0x09,
-	BPLIST_FILL = 0x0F,			/* will be used for length grabbing */
-	BPLIST_UINT = 0x10,
-	BPLIST_REAL = 0x20,
-	BPLIST_DATE = 0x30,
-	BPLIST_DATA = 0x40,
-	BPLIST_STRING = 0x50,
-	BPLIST_UNICODE = 0x60,
-	BPLIST_UID = 0x70,
-	BPLIST_ARRAY = 0xA0,
-	BPLIST_SET = 0xC0,
-	BPLIST_DICT = 0xD0,
-	BPLIST_MASK = 0xF0
-};
-
-void byte_convert(char *address, size_t size)
-{
-	int i = 0, j = 0;
-	char tmp = '\0';
-
-	for (i = 0; i < (size / 2); i++) {
-		tmp = address[i];
-		j = ((size - 1) + 0) - i;
-		address[i] = address[j];
-		address[j] = tmp;
-	}
-}
-
-#include <byteswap.h>
-#define swap_n_bytes(x, n) \
-		n == 8 ? bswap_64(*(uint64_t *)(x)) : \
-		(n == 4 ? bswap_32(*(uint32_t *)(x)) : \
-		(n == 2 ? bswap_16(*(uint16_t *)(x)) : *(x) ))
-
-#define be64dec(x) bswap_64( *(uint64_t*)(x) )
-
-#define get_needed_bytes(x) (x <= 1<<8 ? 1 : ( x <= 1<<16 ? 2 : ( x <= 1<<32 ? 4 : 8)))
-#define get_real_bytes(x) (x >> 32 ? 4 : 8)
-
-GNode *parse_uint_node(char *bnode, uint8_t size, char **next_object)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	size = 1 << size;			// make length less misleading
-	switch (size) {
-	case sizeof(uint8_t):
-		data->intval = bnode[0];
-		break;
-	case sizeof(uint16_t):
-		memcpy(&data->intval, bnode, size);
-		data->intval = ntohs(data->intval);
-		break;
-	case sizeof(uint32_t):
-		memcpy(&data->intval, bnode, size);
-		data->intval = ntohl(data->intval);
-		break;
-	case sizeof(uint64_t):
-		memcpy(&data->intval, bnode, size);
-		byte_convert((char *) &data->intval, size);
-		break;
-	default:
-		free(data);
-		return NULL;
-	};
-
-	*next_object = bnode + size;
-	data->type = PLIST_UINT;
-	return g_node_new(data);
-}
-
-GNode *parse_real_node(char *bnode, uint8_t size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	size = 1 << size;			// make length less misleading
-	switch (size) {
-	case sizeof(float):
-		memcpy(&data->realval, bnode, size);
-		byte_convert((char *) &data->realval, size);
-		break;
-	case sizeof(double):
-		memcpy(&data->realval, bnode, size);
-		byte_convert((char *) &data->realval, size);
-		break;
-	default:
-		free(data);
-		return NULL;
-	}
-	data->type = PLIST_REAL;
-	return g_node_new(data);
-}
-
-GNode *parse_string_node(char *bnode, uint8_t size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	data->type = PLIST_STRING;
-	data->strval = (char *) malloc(sizeof(char) * (size + 1));
-	memcpy(data->strval, bnode, size);
-	data->strval[size] = '\0';
-
-	return g_node_new(data);
-}
-
-GNode *parse_unicode_node(char *bnode, uint8_t size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	data->type = PLIST_UNICODE;
-	data->unicodeval = (wchar_t *) malloc(sizeof(wchar_t) * (size + 1));
-	memcpy(data->unicodeval, bnode, size);
-	data->unicodeval[size] = '\0';
-
-	return g_node_new(data);
-}
-
-GNode *parse_data_node(char *bnode, uint64_t size, uint32_t ref_size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	data->type = PLIST_DATA;
-	data->length = size;
-	data->buff = (char *) malloc(sizeof(char) * size);
-	memcpy(data->buff, bnode, sizeof(char) * size);
-
-	return g_node_new(data);
-}
-
-GNode *parse_dict_node(char *bnode, uint64_t size, uint32_t ref_size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	data->type = PLIST_DICT;
-	data->length = size;
-	data->buff = (char *) malloc(sizeof(char) * size * ref_size * 2);
-	memcpy(data->buff, bnode, sizeof(char) * size * ref_size * 2);
-
-	return g_node_new(data);
-}
-
-GNode *parse_array_node(char *bnode, uint64_t size, uint32_t ref_size)
-{
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	data->type = PLIST_ARRAY;
-	data->length = size;
-	data->buff = (char *) malloc(sizeof(char) * size * ref_size);
-	memcpy(data->buff, bnode, sizeof(char) * size * ref_size);
-
-	return g_node_new(data);
-}
-
-
-
-GNode *parse_bin_node(char *object, uint8_t dict_size, char **next_object)
-{
-	if (!object)
-		return NULL;
-
-	uint16_t type = *object & 0xF0;
-	uint64_t size = *object & 0x0F;
-	object++;
-
-	switch (type) {
-
-	case BPLIST_NULL:
-		switch (size) {
-
-		case BPLIST_TRUE:
-			{
-				struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-				data->type = PLIST_BOOLEAN;
-				data->boolval = TRUE;
-				return g_node_new(data);
-			}
-
-		case BPLIST_FALSE:
-			{
-				struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-				data->type = PLIST_BOOLEAN;
-				data->boolval = FALSE;
-				return g_node_new(data);
-			}
-
-		case BPLIST_NULL:
-		default:
-			return NULL;
-		}
-
-	case BPLIST_UINT:
-		return parse_uint_node(object, size, next_object);
-
-	case BPLIST_REAL:
-		return parse_real_node(object, size);
-
-	case BPLIST_DATE:
-		if (3 != size)
-			return NULL;
-		else
-			return parse_real_node(object, size);
-
-	case BPLIST_DATA:
-		if (0x0F == size) {
-			plist_t size_node = parse_bin_node(object, dict_size, &object);
-			if (plist_get_node_type(size_node) != PLIST_UINT)
-				return NULL;
-			size = plist_get_node_uint_val(size_node);
-		}
-		return parse_data_node(object, size, dict_size);
-
-	case BPLIST_STRING:
-		if (0x0F == size) {
-			plist_t size_node = parse_bin_node(object, dict_size, &object);
-			if (plist_get_node_type(size_node) != PLIST_UINT)
-				return NULL;
-			size = plist_get_node_uint_val(size_node);
-		}
-		return parse_string_node(object, size);
-
-	case BPLIST_UNICODE:
-		if (0x0F == size) {
-			plist_t size_node = parse_bin_node(object, dict_size, &object);
-			if (plist_get_node_type(size_node) != PLIST_UINT)
-				return NULL;
-			size = plist_get_node_uint_val(size_node);
-		}
-		return parse_unicode_node(object, size);
-
-	case BPLIST_UID:
-	case BPLIST_ARRAY:
-		if (0x0F == size) {
-			plist_t size_node = parse_bin_node(object, dict_size, &object);
-			if (plist_get_node_type(size_node) != PLIST_UINT)
-				return NULL;
-			size = plist_get_node_uint_val(size_node);
-		}
-		return parse_array_node(object, size, dict_size);
-
-	case BPLIST_SET:
-	case BPLIST_DICT:
-		if (0x0F == size) {
-			plist_t size_node = parse_bin_node(object, dict_size, &object);
-			if (plist_get_node_type(size_node) != PLIST_UINT)
-				return NULL;
-			object++;
-			size = plist_get_node_uint_val(size_node);
-		}
-		return parse_dict_node(object, size, dict_size);
-
-	}
-	return NULL;
-}
-
-gpointer copy_plist_data(gconstpointer src, gpointer data)
-{
-	struct plist_data *srcdata = (struct plist_data *) src;
-	struct plist_data *dstdata = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-
-	dstdata->type = srcdata->type;
-	dstdata->length = srcdata->length;
-	switch (dstdata->type) {
-	case PLIST_BOOLEAN:
-		dstdata->boolval = srcdata->boolval;
-		break;
-	case PLIST_UINT:
-		dstdata->intval = srcdata->intval;
-		break;
-	case PLIST_DATE:
-	case PLIST_REAL:
-		dstdata->realval = srcdata->realval;
-		break;
-	case PLIST_KEY:
-	case PLIST_STRING:
-		dstdata->strval = strdup(srcdata->strval);
-		break;
-	case PLIST_UNICODE:
-		dstdata->unicodeval = wcsdup(srcdata->unicodeval);
-		break;
-	case PLIST_DATA:
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-		dstdata->buff = (char *) malloc(sizeof(char *) * srcdata->length);
-		memcpy(dstdata->buff, srcdata->buff, sizeof(char *) * srcdata->length);
-		break;
-
-	default:
-		break;
-	}
-
-	return dstdata;
-}
-
-void bin_to_plist(const char *plist_bin, uint32_t length, plist_t * plist)
-{
-	//first check we have enough data
-	if (!(length >= BPLIST_MAGIC_SIZE + BPLIST_VERSION_SIZE + BPLIST_TRL_SIZE))
-		return;
-	//check that plist_bin in actually a plist
-	if (memcmp(plist_bin, BPLIST_MAGIC, BPLIST_MAGIC_SIZE) != 0)
-		return;
-	//check for known version
-	if (memcmp(plist_bin + BPLIST_MAGIC_SIZE, BPLIST_VERSION, BPLIST_VERSION_SIZE) != 0)
-		return;
-
-	//now parse trailer
-	const char *trailer = plist_bin + (length - BPLIST_TRL_SIZE);
-
-	uint8_t offset_size = trailer[BPLIST_TRL_OFFSIZE_IDX];
-	uint8_t dict_param_size = trailer[BPLIST_TRL_PARMSIZE_IDX];
-	uint64_t num_objects = be64dec(trailer + BPLIST_TRL_NUMOBJ_IDX);
-	uint64_t root_object = be64dec(trailer + BPLIST_TRL_ROOTOBJ_IDX);
-	uint64_t offset_table_index = be64dec(trailer + BPLIST_TRL_OFFTAB_IDX);
-
-	log_debug_msg("Offset size: %i\n", offset_size);
-	log_debug_msg("Ref size: %i\n", dict_param_size);
-	log_debug_msg("Number of objects: %lli\n", num_objects);
-	log_debug_msg("Root object index: %lli\n", root_object);
-	log_debug_msg("Offset table index: %lli\n", offset_table_index);
-
-	if (num_objects == 0)
-		return;
-
-	//allocate serialized array of nodes
-	plist_t *nodeslist = NULL;
-	nodeslist = (plist_t *) malloc(sizeof(plist_t) * num_objects);
-
-	if (!nodeslist)
-		return;
-
-	//parse serialized nodes
-	uint64_t i = 0;
-	uint64_t current_offset = 0;
-	const char *offset_table = plist_bin + offset_table_index;
-	for (i = 0; i < num_objects; i++) {
-		current_offset = swap_n_bytes(offset_table + i * offset_size, offset_size);
-
-		log_debug_msg("parse_nodes: current_offset = %i\n", current_offset);
-		char *obj = plist_bin + current_offset;
-		nodeslist[i] = parse_bin_node(obj, dict_param_size, &obj);
-		log_debug_msg("parse_nodes: parse_raw_node done\n");
-	}
-
-	//setup children for structured types
-	int j = 0, str_i = 0, str_j = 0;
-	uint32_t index1 = 0, index2 = 0;
-
-	for (i = 0; i < num_objects; i++) {
-
-		log_debug_msg("parse_nodes: on node %i\n", i);
-		struct plist_data *data = (struct plist_data *) nodeslist[i]->data;
-
-		switch (data->type) {
-		case PLIST_DICT:
-			log_debug_msg("parse_nodes: dictionary found\n");
-			for (j = 0; j < data->length; j++) {
-				str_i = j * dict_param_size;
-				str_j = (j + data->length) * dict_param_size;
-
-				index1 = swap_n_bytes(data->buff + str_i, dict_param_size);
-				index2 = swap_n_bytes(data->buff + str_j, dict_param_size);
-
-				//first one is actually a key
-				((struct plist_data *) nodeslist[index1]->data)->type = PLIST_KEY;
-
-				if (G_NODE_IS_ROOT(nodeslist[index1]))
-					g_node_append(nodeslist[i], nodeslist[index1]);
-				else
-					g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
-
-				if (G_NODE_IS_ROOT(nodeslist[index2]))
-					g_node_append(nodeslist[i], nodeslist[index2]);
-				else
-					g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index2], copy_plist_data, NULL));
-			}
-
-			free(data->buff);
-			break;
-
-		case PLIST_ARRAY:
-			log_debug_msg("parse_nodes: array found\n");
-			for (j = 0; j < data->length; j++) {
-				str_j = j * dict_param_size;
-				index1 = swap_n_bytes(data->buff + str_j, dict_param_size);
-
-				//g_node_append(nodeslist[i], nodeslist[index1]);
-				if (G_NODE_IS_ROOT(nodeslist[index1]))
-					g_node_append(nodeslist[i], nodeslist[index1]);
-				else
-					g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
-			}
-			free(data->buff);
-			break;
-		default:
-			break;
-		}
-	}
-
-	*plist = nodeslist[root_object];
-}
-
-guint plist_data_hash(gconstpointer key)
-{
-	struct plist_data *data = (struct plist_data *) ((GNode *) key)->data;
-
-	guint hash = data->type;
-	guint i = 0;
-
-	char *buff = NULL;
-	guint size = 0;
-
-	switch (data->type) {
-	case PLIST_BOOLEAN:
-	case PLIST_UINT:
-	case PLIST_REAL:
-		buff = (char *) &data->intval;
-		size = 8;
-		break;
-	case PLIST_KEY:
-	case PLIST_STRING:
-		buff = data->strval;
-		size = strlen(buff);
-		break;
-	case PLIST_UNICODE:
-		buff = data->unicodeval;
-		size = strlen(buff) * sizeof(wchar_t);
-		break;
-	case PLIST_DATA:
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-		//for these types only hash pointer
-		buff = &key;
-		size = sizeof(gconstpointer);
-		break;
-	case PLIST_DATE:
-	default:
-		break;
-	}
-
-	//now perform hash
-	for (i = 0; i < size; buff++, i++)
-		hash = hash << 7 ^ (*buff);
-
-	return hash;
-}
-
-gboolean plist_data_compare(gconstpointer a, gconstpointer b)
-{
-	if (!a || !b)
-		return FALSE;
-
-	if (!((GNode *) a)->data || !((GNode *) b)->data)
-		return FALSE;
-
-	struct plist_data *val_a = (struct plist_data *) ((GNode *) a)->data;
-	struct plist_data *val_b = (struct plist_data *) ((GNode *) b)->data;
-
-	if (val_a->type != val_b->type)
-		return FALSE;
-
-	switch (val_a->type) {
-	case PLIST_BOOLEAN:
-	case PLIST_UINT:
-	case PLIST_REAL:
-		if (val_a->intval == val_b->intval)	//it is an union so this is sufficient
-			return TRUE;
-		else
-			return FALSE;
-
-	case PLIST_KEY:
-	case PLIST_STRING:
-		if (!strcmp(val_a->strval, val_b->strval))
-			return TRUE;
-		else
-			return FALSE;
-	case PLIST_UNICODE:
-		if (!strcmp(val_a->unicodeval, val_b->unicodeval))
-			return TRUE;
-		else
-			return FALSE;
-
-	case PLIST_DATA:
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-		//compare pointer
-		if (a == b)
-			return TRUE;
-		else
-			return FALSE;
-		break;
-	case PLIST_DATE:
-	default:
-		break;
-	}
-	return FALSE;
-}
-
-struct serialize_s {
-	GPtrArray *objects;
-	GHashTable *ref_table;
-};
-
-void serialize_plist(GNode * node, gpointer data)
-{
-	struct serialize_s *ser = (struct serialize_s *) data;
-	uint64_t current_index = ser->objects->len;
-
-	//first check that node is not yet in objects
-	gpointer val = g_hash_table_lookup(ser->ref_table, node);
-	if (val) {
-		//data is already in table
-		return;
-	}
-	//insert new ref
-	g_hash_table_insert(ser->ref_table, node, GUINT_TO_POINTER(current_index));
-
-	//now append current node to object array
-	g_ptr_array_add(ser->objects, node);
-
-	//now recurse on children
-	g_node_children_foreach(node, G_TRAVERSE_ALL, serialize_plist, data);
-	return;
-}
-
-#define Log2(x) (x == 8 ? 3 : (x == 4 ? 2 : (x == 2 ? 1 : 0)))
-
-void write_int(GByteArray * bplist, uint64_t val)
-{
-	uint64_t size = get_needed_bytes(val);
-	uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
-	buff[0] = BPLIST_UINT | Log2(size);
-	memcpy(buff + 1, &val, size);
-	byte_convert(buff + 1, size);
-	g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
-	free(buff);
-}
-
-void write_real(GByteArray * bplist, double val)
-{
-	uint64_t size = get_real_bytes(*((uint64_t *) & val));	//cheat to know used space
-	uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
-	buff[0] = BPLIST_REAL | Log2(size);
-	memcpy(buff + 1, &val, size);
-	byte_convert(buff + 1, size);
-	g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
-	free(buff);
-}
-
-void write_raw_data(GByteArray * bplist, uint8_t mark, uint8_t * val, uint64_t size)
-{
-	uint8_t marker = mark | (size < 15 ? size : 0xf);
-	g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-	if (size >= 15) {
-		GByteArray *int_buff = g_byte_array_new();
-		write_int(int_buff, size);
-		g_byte_array_append(bplist, int_buff->data, int_buff->len);
-		g_byte_array_free(int_buff, TRUE);
-	}
-	uint8_t *buff = (uint8_t *) malloc(size);
-	memcpy(buff, val, size);
-	g_byte_array_append(bplist, buff, size);
-	free(buff);
-}
-
-void write_data(GByteArray * bplist, uint8_t * val, uint64_t size)
-{
-	write_raw_data(bplist, BPLIST_DATA, val, size);
-}
-
-void write_string(GByteArray * bplist, char *val)
-{
-	uint64_t size = strlen(val);
-	write_raw_data(bplist, BPLIST_STRING, val, size);
-}
-
-void write_array(GByteArray * bplist, GNode * node, GHashTable * ref_table, uint8_t dict_param_size)
-{
-	uint64_t size = g_node_n_children(node);
-	uint8_t marker = BPLIST_ARRAY | (size < 15 ? size : 0xf);
-	g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-	if (size >= 15) {
-		GByteArray *int_buff = g_byte_array_new();
-		write_int(int_buff, size);
-		g_byte_array_append(bplist, int_buff->data, int_buff->len);
-		g_byte_array_free(int_buff, TRUE);
-	}
-
-	uint64_t idx = 0;
-	uint8_t *buff = (uint8_t *) malloc(size * dict_param_size);
-
-	GNode *cur = NULL;
-	int i = 0;
-	for (i = 0, cur = node->children; cur && i < size; cur = cur->next, i++) {
-		idx = GPOINTER_TO_UINT(g_hash_table_lookup(ref_table, cur));
-		memcpy(buff + i * dict_param_size, &idx, dict_param_size);
-		byte_convert(buff + i * dict_param_size, dict_param_size);
-	}
-
-	//now append to bplist
-	g_byte_array_append(bplist, buff, size * dict_param_size);
-	free(buff);
-
-}
-
-void write_dict(GByteArray * bplist, GNode * node, GHashTable * ref_table, uint8_t dict_param_size)
-{
-	uint64_t size = g_node_n_children(node) / 2;
-	uint8_t marker = BPLIST_DICT | (size < 15 ? size : 0xf);
-	g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-	if (size >= 15) {
-		GByteArray *int_buff = g_byte_array_new();
-		write_int(int_buff, size);
-		g_byte_array_append(bplist, int_buff->data, int_buff->len);
-		g_byte_array_free(int_buff, TRUE);
-	}
-
-	uint64_t idx1 = 0;
-	uint64_t idx2 = 0;
-	uint8_t *buff = (uint8_t *) malloc(size * 2 * dict_param_size);
-
-	GNode *cur = NULL;
-	int i = 0;
-	for (i = 0, cur = node->children; cur && i < size; cur = cur->next->next, i++) {
-		idx1 = GPOINTER_TO_UINT(g_hash_table_lookup(ref_table, cur));
-		memcpy(buff + i * dict_param_size, &idx1, dict_param_size);
-		byte_convert(buff + i * dict_param_size, dict_param_size);
-
-		idx2 = GPOINTER_TO_UINT(g_hash_table_lookup(ref_table, cur->next));
-		memcpy(buff + (i + size) * dict_param_size, &idx2, dict_param_size);
-		byte_convert(buff + (i + size) * dict_param_size, dict_param_size);
-	}
-
-	//now append to bplist
-	g_byte_array_append(bplist, buff, size * 2 * dict_param_size);
-	free(buff);
-
-}
-
-void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length)
-{
-	//check for valid input
-	if (!plist || !plist_bin || *plist_bin || !length)
-		return;
-
-	//list of objects
-	GPtrArray *objects = g_ptr_array_new();
-	//hashtable to write only once same nodes
-	GHashTable *ref_table = g_hash_table_new(plist_data_hash, plist_data_compare);
-
-	//serialize plist
-	struct serialize_s ser_s = { objects, ref_table };
-	serialize_plist(plist, &ser_s);
-
-	//now stream to output buffer
-	uint8_t offset_size = 0;	//unknown yet
-	uint8_t dict_param_size = get_needed_bytes(objects->len);
-	uint64_t num_objects = objects->len;
-	uint64_t root_object = 0;	//root is first in list
-	uint64_t offset_table_index = 0;	//unknown yet
-
-	//setup a dynamic bytes array to store bplist in
-	GByteArray *bplist_buff = g_byte_array_new();
-
-	//set magic number and version
-	g_byte_array_append(bplist_buff, BPLIST_MAGIC, BPLIST_MAGIC_SIZE);
-	g_byte_array_append(bplist_buff, BPLIST_VERSION, BPLIST_VERSION_SIZE);
-
-	//write objects and table
-	int i = 0;
-	uint8_t *buff = NULL;
-	uint8_t size = 0;
-	uint64_t offsets[num_objects];
-	for (i = 0; i < num_objects; i++) {
-
-		offsets[i] = bplist_buff->len;
-		struct plist_data *data = (struct plist_data *) ((GNode *) g_ptr_array_index(objects, i))->data;
-
-		switch (data->type) {
-		case PLIST_BOOLEAN:
-			buff = (uint8_t *) malloc(sizeof(uint8_t));
-			buff[0] = data->boolval ? BPLIST_TRUE : BPLIST_FALSE;
-			g_byte_array_append(bplist_buff, buff, sizeof(uint8_t));
-			free(buff);
-			break;
-
-		case PLIST_UINT:
-			write_int(bplist_buff, data->intval);
-			break;
-
-		case PLIST_REAL:
-			write_real(bplist_buff, data->realval);
-			break;
-
-		case PLIST_KEY:
-		case PLIST_STRING:
-			write_string(bplist_buff, data->strval);
-			break;
-		case PLIST_UNICODE:
-			//TODO
-			break;
-		case PLIST_DATA:
-			write_data(bplist_buff, data->strval, data->length);
-		case PLIST_ARRAY:
-			write_array(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
-			break;
-		case PLIST_DICT:
-			write_dict(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
-			break;
-		case PLIST_DATE:
-			//TODO
-			break;
-		default:
-			break;
-		}
-	}
-
-	//write offsets
-	offset_size = get_needed_bytes(bplist_buff->len);
-	offset_table_index = bplist_buff->len;
-	for (i = 0; i <= num_objects; i++) {
-		uint8_t *buff = (uint8_t *) malloc(offset_size);
-		memcpy(buff, offsets + i, offset_size);
-		byte_convert(buff, offset_size);
-		g_byte_array_append(bplist_buff, buff, offset_size);
-		free(buff);
-	}
-
-	//setup trailer
-	num_objects = bswap_64(num_objects);
-	root_object = bswap_64(root_object);
-	offset_table_index = bswap_64(offset_table_index);
-
-	char trailer[BPLIST_TRL_SIZE];
-	memcpy(trailer + BPLIST_TRL_OFFSIZE_IDX, &offset_size, sizeof(uint8_t));
-	memcpy(trailer + BPLIST_TRL_PARMSIZE_IDX, &dict_param_size, sizeof(uint8_t));
-	memcpy(trailer + BPLIST_TRL_NUMOBJ_IDX, &num_objects, sizeof(uint64_t));
-	memcpy(trailer + BPLIST_TRL_ROOTOBJ_IDX, &root_object, sizeof(uint64_t));
-	memcpy(trailer + BPLIST_TRL_OFFTAB_IDX, &offset_table_index, sizeof(uint64_t));
-
-	g_byte_array_append(bplist_buff, trailer, BPLIST_TRL_SIZE);
-
-	//duplicate buffer
-	*plist_bin = (char *) malloc(bplist_buff->len);
-	memcpy(*plist_bin, bplist_buff->data, bplist_buff->len);
-	*length = bplist_buff->len;
-
-	g_byte_array_free(bplist_buff, TRUE);
-}
diff --git a/src/lockdown.c b/src/lockdown.c
index e882128..5b83fb9 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -30,6 +30,8 @@
 #include <libtasn1.h>
 #include <gnutls/x509.h>
 
+#include <plist/plist.h>
+
 const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
 	{"PKCS1", 536872976, 0},
 	{0, 1073741836, 0},
@@ -177,10 +179,9 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
 	int bytes = 0, i = 0;
 	iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
-	plist_t dict = NULL;
-	plist_new_dict(&dict);
-
-	plist_add_dict_element(dict, "Request", PLIST_STRING, (void *) "QueryType", strlen("QueryType"));
+	plist_t dict = plist_new_dict();
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "Request", strlen("Request"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) "QueryType", strlen("QueryType"));
 
 	log_debug_msg("lockdownd_hello() called\n");
 	char *XML_content = NULL;
@@ -197,14 +198,14 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
 
 	ret = iphone_lckd_recv(control, &XML_content, &bytes);
 	log_debug_msg("Receive msg :\nsize : %i\nxml : %s", bytes, XML_content);
-	xml_to_plist(XML_content, bytes, &dict);
+	plist_from_xml(XML_content, bytes, &dict);
 
 	if (!dict)
 		return IPHONE_E_PLIST_ERROR;
 
-	plist_t query_node = find_query_node(dict, "Request", "QueryType");
-	plist_t result_node = g_node_next_sibling(query_node);
-	plist_t value_node = g_node_next_sibling(result_node);
+	plist_t query_node = plist_find_node(dict, PLIST_STRING, "QueryType", strlen("QueryType"));
+	plist_t result_node = plist_get_next_sibling(query_node);
+	plist_t value_node = plist_get_next_sibling(result_node);
 
 	plist_type result_type;
 	plist_type value_type;
@@ -214,8 +215,8 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
 	uint64_t result_length = 0;
 	uint64_t value_length = 0;
 
-	get_type_and_value(result_node, &result_type, (void *) (&result_value), &result_length);
-	get_type_and_value(value_node, &value_type, (void *) (&value_value), &value_length);
+	plist_get_type_and_value(result_node, &result_type, (void *) (&result_value), &result_length);
+	plist_get_type_and_value(value_node, &value_type, (void *) (&value_value), &value_length);
 
 	if (result_type == PLIST_KEY &&
 		value_type == PLIST_STRING && !strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
@@ -247,9 +248,11 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, char *r
 	iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
 	/* Setup DevicePublicKey request plist */
-	plist_new_dict(&dict);
-	plist_add_dict_element(dict, req_key, PLIST_STRING, (void *) req_string, strlen(req_string));
-	plist_add_dict_element(dict, "Request", PLIST_STRING, (void *) "GetValue", strlen("GetValue"));
+	dict = plist_new_dict();
+	plist_add_sub_element(dict, PLIST_KEY, (void *) req_key, strlen(req_key));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) req_string, strlen(req_string));
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "Request", strlen("Request"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) "GetValue", strlen("GetValue"));
 	plist_to_xml(dict, &XML_content, &length);
 
 	/* send to iPhone */
@@ -271,13 +274,13 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, char *r
 	if (ret != IPHONE_E_SUCCESS)
 		return ret;
 
-	xml_to_plist(XML_content, bytes, &dict);
+	plist_from_xml(XML_content, bytes, &dict);
 	if (!dict)
 		return IPHONE_E_PLIST_ERROR;
 
-	plist_t query_node = find_query_node(dict, "Request", "GetValue");
-	plist_t result_key_node = g_node_next_sibling(query_node);
-	plist_t result_value_node = g_node_next_sibling(result_key_node);
+	plist_t query_node = plist_find_node(dict, PLIST_STRING, "GetValue", strlen("GetValue"));
+	plist_t result_key_node = plist_get_next_sibling(query_node);
+	plist_t result_value_node = plist_get_next_sibling(result_key_node);
 
 	plist_type result_key_type;
 	plist_type result_value_type;
@@ -286,8 +289,8 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, char *r
 	uint64_t result_length = 0;
 	uint64_t value_length = 0;
 
-	get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &result_length);
-	get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &value_length);
+	plist_get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &result_length);
+	plist_get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &value_length);
 
 	if (result_key_type == PLIST_KEY &&
 		result_value_type == PLIST_STRING && !strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
@@ -299,8 +302,8 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, char *r
 		return IPHONE_E_DICT_ERROR;
 	}
 
-	plist_t value_key_node = g_node_next_sibling(result_key_node);
-	plist_t value_value_node = g_node_next_sibling(value_key_node);
+	plist_t value_key_node = plist_get_next_sibling(result_key_node);
+	plist_t value_value_node = plist_get_next_sibling(value_key_node);
 	plist_type value_key_type;
 	plist_type value_value_type;
 	char *value_key = NULL;
@@ -308,8 +311,8 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, char *r
 	uint64_t key_length = 0;
 	uint64_t valval_length = 0;
 
-	get_type_and_value(value_key_node, &value_key_type, (void *) (&value_key), &key_length);
-	get_type_and_value(value_value_node, &value_value_type, (void *) (&value_value), &valval_length);
+	plist_get_type_and_value(value_key_node, &value_key_type, (void *) (&value_key), &key_length);
+	plist_get_type_and_value(value_value_node, &value_value_type, (void *) (&value_value), &valval_length);
 
 	if (value_key_type == PLIST_KEY && !strcmp(result_key, "Value")) {
 		log_debug_msg("lockdownd_generic_get_value(): success\n");
@@ -438,14 +441,19 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
 	}
 
 	/* Setup Pair request plist */
-	plist_new_dict(&dict);
-	plist_add_dict_element(dict, "PairRecord", PLIST_DICT, NULL, 0);
-	dict_record = g_node_last_child(dict);
-	plist_add_dict_element(dict_record, "DeviceCertificate", PLIST_DATA, (void *) device_cert.data, device_cert.size);
-	plist_add_dict_element(dict_record, "HostCertificate", PLIST_DATA, (void *) host_cert.data, host_cert.size);
-	plist_add_dict_element(dict_record, "HostID", PLIST_STRING, (void *) host_id, strlen(host_id));
-	plist_add_dict_element(dict_record, "RootCertificate", PLIST_DATA, (void *) root_cert.data, root_cert.size);
-	plist_add_dict_element(dict, "Request", PLIST_STRING, (void *) "Pair", strlen("Pair"));
+	dict = plist_new_dict();
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "PairRecord", strlen("PairRecord"));
+	dict_record = plist_add_sub_element(dict, PLIST_DICT, NULL, 0);
+	plist_add_sub_element(dict_record, PLIST_KEY, (void *) "DeviceCertificate", strlen("DeviceCertificate"));
+	plist_add_sub_element(dict_record, PLIST_DATA, (void *) device_cert.data, device_cert.size);
+	plist_add_sub_element(dict_record, PLIST_KEY, (void *) "HostCertificate", strlen("HostCertificate"));
+	plist_add_sub_element(dict_record, PLIST_DATA, (void *) host_cert.data, host_cert.size);
+	plist_add_sub_element(dict_record, PLIST_KEY, (void *) "HostID", strlen("HostID"));
+	plist_add_sub_element(dict_record, PLIST_STRING, (void *) host_id, strlen(host_id));
+	plist_add_sub_element(dict_record, PLIST_KEY, (void *) "RootCertificate", strlen("RootCertificate"));
+	plist_add_sub_element(dict_record, PLIST_DATA, (void *) root_cert.data, root_cert.size);
+	plist_add_sub_element(dict_record, PLIST_KEY, (void *) "Request", strlen("Request"));
+	plist_add_sub_element(dict_record, PLIST_STRING, (void *) "Pair", strlen("Pair"));
 	plist_to_xml(dict, &XML_content, &length);
 	log_debug_msg("XML Pairing request :\nsize : %i\nxml :\n %s", length, XML_content);
 
@@ -469,13 +477,13 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
 	log_debug_msg(XML_content);
 	log_debug_msg("\n\n");
 
-	xml_to_plist(XML_content, bytes, &dict);
+	plist_from_xml(XML_content, bytes, &dict);
 	if (!dict)
 		return IPHONE_E_PLIST_ERROR;
 
-	plist_t query_node = find_query_node(dict, "Request", "Pair");
-	plist_t result_key_node = g_node_next_sibling(query_node);
-	plist_t result_value_node = g_node_next_sibling(result_key_node);
+	plist_t query_node = plist_find_node(dict, PLIST_STRING, "Pair", strlen("Pair"));
+	plist_t result_key_node = plist_get_next_sibling(query_node);
+	plist_t result_value_node = plist_get_next_sibling(result_key_node);
 
 	plist_type result_key_type;
 	plist_type result_value_type;
@@ -484,8 +492,8 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
 	uint64_t key_length = 0;
 	uint64_t val_length = 0;
 
-	get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &key_length);
-	get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &val_length);
+	plist_get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &key_length);
+	plist_get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &val_length);
 
 	if (result_key_type == PLIST_KEY &&
 		result_value_type == PLIST_STRING && !strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
@@ -649,9 +657,11 @@ iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const c
 	iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
 	/* Setup DevicePublicKey request plist */
-	plist_new_dict(&dict);
-	plist_add_dict_element(dict, "HostID", PLIST_STRING, (void *) HostID, strlen(HostID));
-	plist_add_dict_element(dict, "Request", PLIST_STRING, (void *) "StartSession", strlen("StartSession"));
+	dict = plist_new_dict();
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "HostID", strlen("HostID"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) HostID, strlen(HostID));
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "Request", strlen("Request"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) "StartSession", strlen("StartSession"));
 	plist_to_xml(dict, &XML_content, &length);
 	log_debug_msg("Send msg :\nsize : %i\nxml : %s", length, XML_content);
 
@@ -668,13 +678,13 @@ iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const c
 	if (bytes > 0) {
 		ret = iphone_lckd_recv(control, &XML_content, &bytes);
 		log_debug_msg("Receive msg :\nsize : %i\nxml : %s", bytes, XML_content);
-		xml_to_plist(XML_content, bytes, &dict);
+		plist_from_xml(XML_content, bytes, &dict);
 		if (!dict)
 			return IPHONE_E_PLIST_ERROR;
 
-		plist_t query_node = find_query_node(dict, "Request", "StartSession");
-		plist_t result_key_node = g_node_next_sibling(query_node);
-		plist_t result_value_node = g_node_next_sibling(result_key_node);
+		plist_t query_node = plist_find_node(dict, PLIST_STRING, "StartSession", strlen("StartSession"));
+		plist_t result_key_node = plist_get_next_sibling(query_node);
+		plist_t result_value_node = plist_get_next_sibling(result_key_node);
 
 		plist_type result_key_type;
 		plist_type result_value_type;
@@ -683,8 +693,8 @@ iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const c
 		uint64_t key_length = 0;
 		uint64_t val_length = 0;
 
-		get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &key_length);
-		get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &val_length);
+		plist_get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &key_length);
+		plist_get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &val_length);
 
 		free(XML_content);
 		XML_content = NULL;
@@ -886,9 +896,11 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
 	free(host_id);
 	host_id = NULL;
 
-	plist_new_dict(&dict);
-	plist_add_dict_element(dict, "Request", PLIST_STRING, (void *) "StartService", strlen("StartService"));
-	plist_add_dict_element(dict, "Service", PLIST_STRING, (void *) service, strlen(service));
+	dict = plist_new_dict();
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "Request", strlen("Request"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) "StartService", strlen("StartService"));
+	plist_add_sub_element(dict, PLIST_KEY, (void *) "Service", strlen("Service"));
+	plist_add_sub_element(dict, PLIST_STRING, (void *) service, strlen(service));
 	plist_to_xml(dict, &XML_content, &length);
 
 	/* send to iPhone */
@@ -908,7 +920,7 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
 	if (IPHONE_E_SUCCESS != ret)
 		return ret;
 
-	xml_to_plist(XML_content, bytes, &dict);
+	plist_from_xml(XML_content, bytes, &dict);
 	if (!dict)
 		return IPHONE_E_PLIST_ERROR;
 
@@ -917,12 +929,12 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
 		return IPHONE_E_NOT_ENOUGH_DATA;
 	else {
 
-		plist_t query_node = find_query_node(dict, "Request", "StartService");
-		plist_t result_key_node = g_node_next_sibling(query_node);
-		plist_t result_value_node = g_node_next_sibling(result_key_node);
+		plist_t query_node = plist_find_node(dict, PLIST_STRING, "StartService", strlen("StartService"));
+		plist_t result_key_node = plist_get_next_sibling(query_node);
+		plist_t result_value_node = plist_get_next_sibling(result_key_node);
 
-		plist_t port_key_node = find_node(dict, PLIST_KEY, "Port");
-		plist_t port_value_node = g_node_next_sibling(port_key_node);
+		plist_t port_key_node = plist_find_node(dict, PLIST_KEY, "Port", strlen("Port"));
+		plist_t port_value_node = plist_get_next_sibling(port_key_node);
 
 		plist_type result_key_type;
 		plist_type result_value_type;
@@ -937,10 +949,10 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
 		uint64_t port_val_length = 0;
 		uint64_t port_value = 0;
 
-		get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &res_key_length);
-		get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &res_val_length);
-		get_type_and_value(port_key_node, &port_key_type, (void *) (&port_key), &port_key_length);
-		get_type_and_value(port_value_node, &port_value_type, (void *) (&port_value), &port_val_length);
+		plist_get_type_and_value(result_key_node, &result_key_type, (void *) (&result_key), &res_key_length);
+		plist_get_type_and_value(result_value_node, &result_value_type, (void *) (&result_value), &res_val_length);
+		plist_get_type_and_value(port_key_node, &port_key_type, (void *) (&port_key), &port_key_length);
+		plist_get_type_and_value(port_value_node, &port_value_type, (void *) (&port_value), &port_val_length);
 
 		if (result_key_type == PLIST_KEY &&
 			result_value_type == PLIST_STRING &&
diff --git a/src/lockdown.h b/src/lockdown.h
index 8b3dd41..18e13aa 100644
--- a/src/lockdown.h
+++ b/src/lockdown.h
@@ -23,7 +23,6 @@
 #define LOCKDOWND_H
 
 #include "usbmux.h"
-#include "plist.h"
 
 #include <gnutls/gnutls.h>
 #include <string.h>
diff --git a/src/plist.c b/src/plist.c
deleted file mode 100644
index 932ea5e..0000000
--- a/src/plist.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * plist.c
- * Builds plist XML structures.
- *
- * Copyright (c) 2008 Zach C. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
-
-
-#include <string.h>
-#include <assert.h>
-#include "utils.h"
-#include "plist.h"
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-
-void plist_new_dict(plist_t * plist)
-{
-	if (*plist != NULL)
-		return;
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-	data->type = PLIST_DICT;
-	*plist = g_node_new(data);
-}
-
-void plist_new_array(plist_t * plist)
-{
-	if (*plist != NULL)
-		return;
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-	data->type = PLIST_ARRAY;
-	*plist = g_node_new(data);
-}
-
-void plist_new_dict_in_plist(plist_t plist, plist_t * dict)
-{
-	if (!plist || *dict)
-		return;
-
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-	data->type = PLIST_DICT;
-	*dict = g_node_new(data);
-	g_node_append(plist, *dict);
-}
-
-
-/** Adds a new key pair to a dict.
- *
- * @param dict The dict node in the plist.
- * @param key the key name of the key pair.
- * @param type The the type of the value in the key pair.
- * @param value a pointer to the actual buffer containing the value. WARNING : the buffer is supposed to match the type of the value
- *
- */
-void plist_add_dict_element(plist_t dict, char *key, plist_type type, void *value, uint64_t length)
-{
-	if (!dict || !key || !value)
-		return;
-
-	struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-	data->type = PLIST_KEY;
-	data->strval = strdup(key);
-	GNode *keynode = g_node_new(data);
-	g_node_append(dict, keynode);
-
-	//now handle value
-	struct plist_data *val = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-	val->type = type;
-	val->length = length;
-
-	switch (type) {
-	case PLIST_BOOLEAN:
-		val->boolval = *((char *) value);
-		break;
-	case PLIST_UINT:
-		val->intval = *((uint64_t *) value);
-		break;
-	case PLIST_REAL:
-		val->realval = *((double *) value);
-		break;
-	case PLIST_STRING:
-		val->strval = strdup((char *) value);
-		break;
-	case PLIST_UNICODE:
-		val->unicodeval = wcsdup((wchar_t *) value);
-		break;
-	case PLIST_DATA:
-		memcpy(val->buff, value, length);
-		break;
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-	case PLIST_DATE:
-	default:
-		break;
-	}
-	GNode *valnode = g_node_new(val);
-	g_node_append(dict, valnode);
-}
-
-void plist_free(plist_t plist)
-{
-	g_node_destroy(plist);
-}
-
-plist_t find_query_node(plist_t plist, char *key, char *request)
-{
-	if (!plist)
-		return NULL;
-
-	GNode *current = NULL;
-	for (current = plist->children; current; current = current->next) {
-
-		struct plist_data *data = (struct plist_data *) current->data;
-
-		if (data->type == PLIST_KEY && !strcmp(data->strval, key) && current->next) {
-
-			data = (struct plist_data *) current->next->data;
-			if (data->type == PLIST_STRING && !strcmp(data->strval, request))
-				return current->next;
-		}
-		if (data->type == PLIST_DICT || data->type == PLIST_ARRAY) {
-			GNode *sub = find_query_node(current, key, request);
-			if (sub)
-				return sub;
-		}
-	}
-	return NULL;
-}
-
-char compare_node_value(plist_type type, struct plist_data *data, void *value)
-{
-	char res = FALSE;
-	switch (type) {
-	case PLIST_BOOLEAN:
-		res = data->boolval == *((char *) value) ? TRUE : FALSE;
-		break;
-	case PLIST_UINT:
-		res = data->intval == *((uint64_t *) value) ? TRUE : FALSE;
-		break;
-	case PLIST_REAL:
-		res = data->realval == *((double *) value) ? TRUE : FALSE;
-		break;
-	case PLIST_KEY:
-	case PLIST_STRING:
-		res = !strcmp(data->strval, ((char *) value));
-		break;
-	case PLIST_UNICODE:
-		res = !wcscmp(data->unicodeval, ((wchar_t *) value));
-		break;
-	case PLIST_DATA:
-		res = !strcmp(data->buff, ((char *) value));
-		break;
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-	case PLIST_DATE:
-	default:
-		break;
-	}
-	return res;
-}
-
-plist_t find_node(plist_t plist, plist_type type, void *value)
-{
-	if (!plist)
-		return NULL;
-
-	GNode *current = NULL;
-	for (current = plist->children; current; current = current->next) {
-
-		struct plist_data *data = (struct plist_data *) current->data;
-
-		if (data->type == type && compare_node_value(type, data, value)) {
-			return current;
-		}
-		if (data->type == PLIST_DICT || data->type == PLIST_ARRAY) {
-			GNode *sub = find_node(current, type, value);
-			if (sub)
-				return sub;
-		}
-	}
-	return NULL;
-}
-
-void get_type_and_value(GNode * node, plist_type * type, void *value, uint64_t * length)
-{
-	if (!node)
-		return;
-
-	struct plist_data *data = (struct plist_data *) node->data;
-
-	*type = data->type;
-	*length = data->length;
-
-	switch (*type) {
-	case PLIST_BOOLEAN:
-		*((char *) value) = data->boolval;
-		break;
-	case PLIST_UINT:
-		*((uint64_t *) value) = data->intval;
-		break;
-	case PLIST_REAL:
-		*((double *) value) = data->realval;
-		break;
-	case PLIST_STRING:
-		*((char **) value) = strdup(data->strval);
-		break;
-	case PLIST_UNICODE:
-		*((wchar_t **) value) = wcsdup(data->unicodeval);
-		break;
-	case PLIST_KEY:
-		*((char **) value) = strdup(data->strval);
-		break;
-	case PLIST_DATA:
-	case PLIST_ARRAY:
-	case PLIST_DICT:
-	case PLIST_DATE:
-	default:
-		break;
-	}
-}
-
-plist_type plist_get_node_type(plist_t node)
-{
-	if (node && node->data)
-		return ((struct plist_data *) node->data)->type;
-	else
-		return PLIST_NONE;
-}
-
-uint64_t plist_get_node_uint_val(plist_t node)
-{
-	if (PLIST_UINT == plist_get_node_type(node))
-		return ((struct plist_data *) node->data)->intval;
-	else
-		return 0;
-}
diff --git a/src/plist.h b/src/plist.h
deleted file mode 100644
index 1dc464a..0000000
--- a/src/plist.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * plist.h
- * contains structures and the like for plists
- *
- * Copyright (c) 2008 Zach C. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
-
-#ifndef PLIST_H
-#define PLIST_H
-
-#include <stdint.h>
-#include <wchar.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glib.h>
-
-
-typedef enum {
-	PLIST_BOOLEAN,
-	PLIST_UINT,
-	PLIST_REAL,
-	PLIST_STRING,
-	PLIST_UNICODE,
-	PLIST_ARRAY,
-	PLIST_DICT,
-	PLIST_DATE,
-	PLIST_DATA,
-	PLIST_KEY,
-	PLIST_NONE
-} plist_type;
-
-
-struct plist_data {
-	union {
-		char boolval;
-		uint64_t intval;
-		double realval;
-		char *strval;
-		wchar_t *unicodeval;
-		char *buff;
-	};
-	uint64_t length;
-	plist_type type;
-};
-
-
-
-typedef GNode *plist_t;
-
-
-void plist_new_dict(plist_t * plist);
-void plist_new_array(plist_t * plist);
-void plist_new_dict_in_plist(plist_t plist, plist_t * dict);
-void plist_add_dict_element(plist_t dict, char *key, plist_type type, void *value, uint64_t length);
-void plist_free(plist_t plist);
-
-void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length);
-void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length);
-
-void xml_to_plist(const char *plist_xml, uint32_t length, plist_t * plist);
-void bin_to_plist(const char *plist_bin, uint32_t length, plist_t * plist);
-
-plist_t find_query_node(plist_t plist, char *key, char *request);
-plist_t find_node(plist_t plist, plist_type type, void *value);
-void get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length);
-
-#endif
diff --git a/src/xplist.c b/src/xplist.c
deleted file mode 100644
index 2d650b4..0000000
--- a/src/xplist.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * plist.c
- * XML plist implementation
- *
- * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
-
-
-#include <string.h>
-#include <assert.h>
-#include "utils.h"
-#include "plist.h"
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-
-const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n\
-<plist version=\"1.0\">\n\
-</plist>\0";
-
-
-/** Formats a block of text to be a given indentation and width.
- * 
- * The total width of the return string will be depth + cols.
- *
- * @param buf The string to format.
- * @param cols The number of text columns for returned block of text.
- * @param depth The number of tabs to indent the returned block of text.
- *
- * @return The formatted string.
- */
-char *format_string(const char *buf, int cols, int depth)
-{
-	int colw = depth + cols + 1;
-	int len = strlen(buf);
-	int nlines = len / cols + 1;
-	char *new_buf = (char *) malloc(nlines * colw + depth + 1);
-	int i = 0;
-	int j = 0;
-
-	assert(cols >= 0);
-	assert(depth >= 0);
-
-	// Inserts new lines and tabs at appropriate locations
-	for (i = 0; i < nlines; i++) {
-		new_buf[i * colw] = '\n';
-		for (j = 0; j < depth; j++)
-			new_buf[i * colw + 1 + j] = '\t';
-		memcpy(new_buf + i * colw + 1 + depth, buf + i * cols, cols);
-	}
-	new_buf[len + (1 + depth) * nlines] = '\n';
-
-	// Inserts final row of indentation and termination character
-	for (j = 0; j < depth; j++)
-		new_buf[len + (1 + depth) * nlines + 1 + j] = '\t';
-	new_buf[len + (1 + depth) * nlines + depth + 1] = '\0';
-
-	return new_buf;
-}
-
-
-
-struct xml_node {
-	xmlNodePtr xml;
-	uint32_t depth;
-};
-
-/** Creates a new plist XML document.
- * 
- * @return The plist XML document.
- */
-xmlDocPtr new_xml_plist()
-{
-	char *plist = strdup(plist_base);
-	xmlDocPtr plist_xml = xmlReadMemory(plist, strlen(plist), NULL, NULL, 0);
-
-	if (!plist_xml)
-		return NULL;
-
-	free(plist);
-
-	return plist_xml;
-}
-
-/** Destroys a previously created XML document.
- *
- * @param plist The XML document to destroy.
- */
-void free_plist(xmlDocPtr plist)
-{
-	if (!plist)
-		return;
-
-	xmlFreeDoc(plist);
-}
-
-void node_to_xml(GNode * node, gpointer xml_struct)
-{
-	if (!node)
-		return;
-
-	struct xml_node *xstruct = (struct xml_node *) xml_struct;
-	struct plist_data *node_data = (struct plist_data *) node->data;
-
-	xmlNodePtr child_node = NULL;
-	char isStruct = FALSE;
-
-	gchar *tag = NULL;
-	gchar *val = NULL;
-
-	switch (node_data->type) {
-	case PLIST_BOOLEAN:
-		{
-			if (node_data->boolval)
-				tag = "true";
-			else
-				tag = "false";
-		}
-		break;
-
-	case PLIST_UINT:
-		tag = "integer";
-		val = g_strdup_printf("%lu", (long unsigned int) node_data->intval);
-		break;
-
-	case PLIST_REAL:
-		tag = "real";
-		val = g_strdup_printf("%Lf", (long double) node_data->realval);
-		break;
-
-	case PLIST_STRING:
-		tag = "string";
-		val = g_strdup(node_data->strval);
-		break;
-
-	case PLIST_UNICODE:
-		tag = "string";
-		val = g_strdup((gchar *) node_data->unicodeval);
-		break;
-
-	case PLIST_KEY:
-		tag = "key";
-		val = g_strdup((gchar *) node_data->strval);
-		break;
-
-	case PLIST_DATA:
-		tag = "data";
-		gchar *valtmp = g_base64_encode(node_data->buff, node_data->length);
-		val = format_string(valtmp, 60, xstruct->depth);
-		g_free(valtmp);
-		break;
-	case PLIST_ARRAY:
-		tag = "array";
-		isStruct = TRUE;
-		break;
-	case PLIST_DICT:
-		tag = "dict";
-		isStruct = TRUE;
-		break;
-	case PLIST_DATE:			//TODO : handle date tag
-	default:
-		break;
-	}
-
-	int i = 0;
-	for (i = 0; i < xstruct->depth; i++) {
-		xmlNodeAddContent(xstruct->xml, "\t");
-	}
-	child_node = xmlNewChild(xstruct->xml, NULL, tag, val);
-	xmlNodeAddContent(xstruct->xml, "\n");
-	g_free(val);
-
-	//add return for structured types
-	if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT || node_data->type == PLIST_DATA)
-		xmlNodeAddContent(child_node, "\n");
-
-	if (isStruct) {
-		struct xml_node child = { child_node, xstruct->depth + 1 };
-		g_node_children_foreach(node, G_TRAVERSE_ALL, node_to_xml, &child);
-	}
-	//fix indent for structured types
-	if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT || node_data->type == PLIST_DATA) {
-
-		for (i = 0; i < xstruct->depth; i++) {
-			xmlNodeAddContent(child_node, "\t");
-		}
-	}
-
-	return;
-}
-
-void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node)
-{
-	xmlNodePtr node = NULL;
-
-	for (node = xml_node->children; node; node = node->next) {
-
-		while (node && !xmlStrcmp(node->name, "text"))
-			node = node->next;
-		if (!node)
-			break;
-
-		struct plist_data *data = (struct plist_data *) calloc(sizeof(struct plist_data), 1);
-		GNode *subnode = g_node_new(data);
-		if (*plist_node)
-			g_node_append(*plist_node, subnode);
-		else
-			*plist_node = subnode;
-
-		if (!xmlStrcmp(node->name, "true")) {
-			data->boolval = 1;
-			data->type = PLIST_BOOLEAN;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "false")) {
-			data->boolval = 0;
-			data->type = PLIST_BOOLEAN;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "integer")) {
-			char *strval = xmlNodeGetContent(node);
-			data->intval = g_ascii_strtoull(strval, NULL, 0);
-			data->type = PLIST_UINT;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "real")) {
-			char *strval = xmlNodeGetContent(node);
-			data->realval = atof(strval);
-			data->type = PLIST_REAL;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "date"))
-			continue;			//TODO : handle date tag
-
-		if (!xmlStrcmp(node->name, "string")) {
-			data->strval = strdup(xmlNodeGetContent(node));
-			data->type = PLIST_STRING;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "key")) {
-			data->strval = strdup(xmlNodeGetContent(node));
-			data->type = PLIST_KEY;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "data")) {
-			gsize size = 0;
-			data->buff = g_base64_decode(xmlNodeGetContent(node), &size);
-			data->length = size;
-			data->type = PLIST_DATA;
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "array")) {
-			data->type = PLIST_ARRAY;
-			xml_to_node(node, &subnode);
-			continue;
-		}
-
-		if (!xmlStrcmp(node->name, "dict")) {
-			data->type = PLIST_DICT;
-			xml_to_node(node, &subnode);
-			continue;
-		}
-	}
-}
-
-void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length)
-{
-	if (!plist || !plist_xml || *plist_xml)
-		return;
-	xmlDocPtr plist_doc = new_xml_plist();
-	xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);
-	struct xml_node root = { root_node, 0 };
-
-	node_to_xml(plist, &root);
-
-	xmlDocDumpMemory(plist_doc, (xmlChar **) plist_xml, length);
-}
-
-void xml_to_plist(const char *plist_xml, uint32_t length, plist_t * plist)
-{
-	xmlDocPtr plist_doc = xmlReadMemory(plist_xml, length, NULL, NULL, 0);
-	xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);
-
-	xml_to_node(root_node, plist);
-}