1 files changed, 320 insertions, 319 deletions

diff --git a/src/lockdown.c b/src/lockdown.c
index cf0d99e..c6d5f80 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -31,6 +31,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},
@@ -40,35 +42,6 @@ const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
         {0, 0, 0}
 };
 
-static int get_rand(int min, int max)
-{
-        int retval = (rand() % (max - min)) + min;
-        return retval;
-}
-
-/** Generates a valid HostID (which is actually a UUID).
- *
- * @param A null terminated string containing a valid HostID.
- */
-char *lockdownd_generate_hostid(void)
-{
-        char *hostid = (char *) malloc(sizeof(char) * 37);      // HostID's are just UUID's, and UUID's are 36 characters long
-        const char *chars = "ABCDEF0123456789";
-        srand(time(NULL));
-        int i = 0;
-
-        for (i = 0; i < 36; i++) {
-                if (i == 8 || i == 13 || i == 18 || i == 23) {
-                        hostid[i] = '-';
-                        continue;
-                } else {
-                        hostid[i] = chars[get_rand(0, 16)];
-                }
-        }
-        hostid[36] = '\0';                      // make it a real string
-        return hostid;
-}
-
 /** Creates a lockdownd client for the give iPhone.
  *
  * @param phone The iPhone to create a lockdownd client for
@@ -92,7 +65,6 @@ iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone)
         return control;
 }
 
-
 /** Closes the lockdownd client and does the necessary housekeeping.
  *
  * @param control The lockdown client
@@ -128,7 +100,7 @@ iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, u
                 return IPHONE_E_INVALID_ARG;
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
         char *receive;
-        uint32 datalen = 0, bytes = 0;
+        uint32_t datalen = 0, bytes = 0;
 
         if (!client->in_SSL)
                 ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes);
@@ -202,49 +174,55 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
 {
         if (!control)
                 return IPHONE_E_INVALID_ARG;
-        xmlDocPtr plist = new_plist();
-        xmlNode *dict, *key;
-        char **dictionary;
+
         int bytes = 0, i = 0;
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
+        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");
-        dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
-        key = add_key_str_dict_element(plist, dict, "Request", "QueryType", 1);
-        char *XML_content;
-        uint32 length;
+        char *XML_content = NULL;
+        uint32_t length = 0;
 
-        xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
+        plist_to_xml(dict, &XML_content, &length);
+        log_debug_msg("Send msg :\nsize : %i\nxml : %s", length, XML_content);
         ret = iphone_lckd_send(control, XML_content, length, &bytes);
 
-        xmlFree(XML_content);
-        xmlFreeDoc(plist);
-        plist = NULL;
+        free(XML_content);
+        XML_content = NULL;
+        plist_free(dict);
+        dict = NULL;
+
         ret = iphone_lckd_recv(control, &XML_content, &bytes);
+        log_debug_msg("Receive msg :\nsize : %i\nxml : %s", bytes, XML_content);
+        plist_from_xml(XML_content, bytes, &dict);
 
-        plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
-        if (!plist)
-                return IPHONE_E_PLIST_ERROR;
-        dict = xmlDocGetRootElement(plist);
-        for (dict = dict->children; dict; dict = dict->next) {
-                if (!xmlStrcmp(dict->name, "dict"))
-                        break;
-        }
         if (!dict)
-                return IPHONE_E_DICT_ERROR;
-        dictionary = read_dict_element_strings(dict);
-        xmlFreeDoc(plist);
-        free(XML_content);
+                return IPHONE_E_PLIST_ERROR;
 
-        for (i = 0; dictionary[i]; i += 2) {
-                if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
-                        log_debug_msg("lockdownd_hello(): success\n");
-                        ret = IPHONE_E_SUCCESS;
-                        break;
-                }
+        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;
+
+        char *result_value = NULL;
+        char *value_value = NULL;
+        uint64_t result_length = 0;
+        uint64_t value_length = 0;
+
+        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")) {
+                log_debug_msg("lockdownd_hello(): success\n");
+                ret = IPHONE_E_SUCCESS;
         }
 
-        free_dictionary(dictionary);
         return ret;
 }
 
@@ -256,74 +234,94 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
  *
  * @return IPHONE_E_SUCCESS on success.
  */
-iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, const char *req_string,
-                                                                                   char **value)
+iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, char *req_string,
+                                                                                   gnutls_datum_t * value)
 {
-        if (!control || !req_key || !value || (value && *value))
+        if (!control || !req_key || !value || value->data)
                 return IPHONE_E_INVALID_ARG;
-        xmlDocPtr plist = new_plist();
-        xmlNode *dict = NULL;
-        xmlNode *key = NULL;;
-        char **dictionary = NULL;
+
+        plist_t dict = NULL;
         int bytes = 0, i = 0;
         char *XML_content = NULL;
-        uint32 length = 0;
+        uint32_t length = 0;
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
         /* Setup DevicePublicKey request plist */
-        dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
-        key = add_key_str_dict_element(plist, dict, req_key, req_string, 1);
-        key = add_key_str_dict_element(plist, dict, "Request", "GetValue", 1);
-        xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
+        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 */
+        log_debug_msg("Send msg :\nsize : %i\nxml : %s", length, XML_content);
         ret = iphone_lckd_send(control, XML_content, length, &bytes);
 
-        xmlFree(XML_content);
-        xmlFreeDoc(plist);
-        plist = NULL;
+        free(XML_content);
+        XML_content = NULL;
+        plist_free(dict);
+        dict = NULL;
 
         if (ret != IPHONE_E_SUCCESS)
                 return ret;
 
         /* Now get iPhone's answer */
         ret = iphone_lckd_recv(control, &XML_content, &bytes);
+        log_debug_msg("Receive msg :\nsize : %i\nxml : %s", bytes, XML_content);
 
         if (ret != IPHONE_E_SUCCESS)
                 return ret;
 
-        plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
-        if (!plist)
-                return IPHONE_E_PLIST_ERROR;
-        dict = xmlDocGetRootElement(plist);
-        for (dict = dict->children; dict; dict = dict->next) {
-                if (!xmlStrcmp(dict->name, "dict"))
-                        break;
-        }
+        plist_from_xml(XML_content, bytes, &dict);
         if (!dict)
-                return IPHONE_E_DICT_ERROR;
+                return IPHONE_E_PLIST_ERROR;
 
-        /* Parse xml to check success and to find public key */
-        dictionary = read_dict_element_strings(dict);
-        xmlFreeDoc(plist);
-        free(XML_content);
+        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);
 
-        int success = 0;
-        for (i = 0; dictionary[i]; i += 2) {
-                if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
-                        success = 1;
-                }
-                if (!strcmp(dictionary[i], "Value")) {
-                        *value = strdup(dictionary[i + 1]);
-                }
+        plist_type result_key_type;
+        plist_type result_value_type;
+        char *result_key = NULL;
+        char *result_value = NULL;
+        uint64_t result_length = 0;
+        uint64_t value_length = 0;
+
+        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")) {
+                log_debug_msg("lockdownd_generic_get_value(): success\n");
+                ret = IPHONE_E_SUCCESS;
         }
 
-        if (dictionary) {
-                free_dictionary(dictionary);
-                dictionary = NULL;
+        if (ret != IPHONE_E_SUCCESS) {
+                return IPHONE_E_DICT_ERROR;
         }
-        if (success)
+
+        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;
+        char *value_value = NULL;
+        uint64_t key_length = 0;
+        uint64_t valval_length = 0;
+
+        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");
+                value->data = value_value;
+                value->size = valval_length;
                 ret = IPHONE_E_SUCCESS;
+        }
+
+        plist_free(dict);
+        free(XML_content);
         return ret;
 }
 
@@ -335,7 +333,9 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const c
  */
 iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid)
 {
-        return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", uid);
+        gnutls_datum_t temp = { NULL, 0 };
+        return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", &temp);
+        *uid = temp.data;
 }
 
 /** Askes for the device's public key. Part of the lockdownd handshake.
@@ -344,7 +344,7 @@ iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid
  *
  * @return 1 on success and 0 on failure.
  */
-iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, char **public_key)
+iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, gnutls_datum_t * public_key)
 {
         return lockdownd_generic_get_value(control, "Key", "DevicePublicKey", public_key);
 }
@@ -416,51 +416,52 @@ iphone_error_t iphone_lckd_new_client(iphone_device_t device, iphone_lckd_client
 iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id)
 {
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
-        xmlDocPtr plist = new_plist();
-        xmlNode *dict = NULL;
-        xmlNode *dictRecord = NULL;
-        char **dictionary = NULL;
+        plist_t dict = NULL;
+        plist_t dict_record = NULL;
         int bytes = 0, i = 0;
         char *XML_content = NULL;
-        uint32 length = 0;
+        uint32_t length = 0;
 
-        char *device_cert_b64 = NULL;
-        char *host_cert_b64 = NULL;
-        char *root_cert_b64 = NULL;
-        char *public_key_b64 = NULL;
+        gnutls_datum_t device_cert = { NULL, 0 };
+        gnutls_datum_t host_cert = { NULL, 0 };
+        gnutls_datum_t root_cert = { NULL, 0 };
+        gnutls_datum_t public_key = { NULL, 0 };
 
-        ret = lockdownd_get_device_public_key(control, &public_key_b64);
+        ret = lockdownd_get_device_public_key(control, &public_key);
         if (ret != IPHONE_E_SUCCESS) {
                 fprintf(stderr, "Device refused to send public key.\n");
                 return ret;
         }
 
-        ret = lockdownd_gen_pair_cert(public_key_b64, &device_cert_b64, &host_cert_b64, &root_cert_b64);
+        ret = lockdownd_gen_pair_cert(public_key, &device_cert, &host_cert, &root_cert);
         if (ret != IPHONE_E_SUCCESS) {
-                free(public_key_b64);
+                free(public_key.data);
                 return ret;
         }
 
         /* Setup Pair request plist */
-        dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
-        dictRecord = add_key_dict_node(plist, dict, "PairRecord", "\n", 1);
-        //dictRecord = add_child_to_plist(plist, "dict", "\n", NULL, 1);
-        add_key_data_dict_element(plist, dictRecord, "DeviceCertificate", device_cert_b64, 2);
-        add_key_data_dict_element(plist, dictRecord, "HostCertificate", host_cert_b64, 2);
-        add_key_str_dict_element(plist, dictRecord, "HostID", host_id, 2);
-        add_key_data_dict_element(plist, dictRecord, "RootCertificate", root_cert_b64, 2);
-        add_key_str_dict_element(plist, dict, "Request", "Pair", 1);
-
-        xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
-
-        printf("XML Pairing request : %s\n", XML_content);
+        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);
 
         /* send to iPhone */
         ret = iphone_lckd_send(control, XML_content, length, &bytes);
 
-        xmlFree(XML_content);
-        xmlFreeDoc(plist);
-        plist = NULL;
+        free(XML_content);
+        plist_free(dict);
+        dict = NULL;
 
         if (ret != IPHONE_E_SUCCESS)
                 return ret;
@@ -475,48 +476,39 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
         log_debug_msg(XML_content);
         log_debug_msg("\n\n");
 
-        plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
-        if (!plist) {
-                free(public_key_b64);
+        plist_from_xml(XML_content, bytes, &dict);
+        if (!dict)
                 return IPHONE_E_PLIST_ERROR;
-        }
-        dict = xmlDocGetRootElement(plist);
-        for (dict = dict->children; dict; dict = dict->next) {
-                if (!xmlStrcmp(dict->name, "dict"))
-                        break;
-        }
-        if (!dict) {
-                free(public_key_b64);
-                return IPHONE_E_DICT_ERROR;
-        }
 
-        /* Parse xml to check success and to find public key */
-        dictionary = read_dict_element_strings(dict);
-        xmlFreeDoc(plist);
-        free(XML_content);
+        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);
 
-        int success = 0;
-        for (i = 0; dictionary[i]; i += 2) {
-                if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
-                        success = 1;
-                }
-        }
+        plist_type result_key_type;
+        plist_type result_value_type;
+        char *result_key = NULL;
+        char *result_value = NULL;
+        uint64_t key_length = 0;
+        uint64_t val_length = 0;
+
+        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 (dictionary) {
-                free_dictionary(dictionary);
-                dictionary = NULL;
+        if (result_key_type == PLIST_KEY &&
+                result_value_type == PLIST_STRING && !strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
+                ret = IPHONE_E_SUCCESS;
         }
 
         /* store public key in config if pairing succeeded */
-        if (success) {
+        if (ret == IPHONE_E_SUCCESS) {
                 log_debug_msg("lockdownd_pair_device: pair success\n");
-                store_device_public_key(uid, public_key_b64);
+                store_device_public_key(uid, public_key);
                 ret = IPHONE_E_SUCCESS;
         } else {
                 log_debug_msg("lockdownd_pair_device: pair failure\n");
                 ret = IPHONE_E_PAIRING_FAILED;
         }
-        free(public_key_b64);
+        free(public_key.data);
         return ret;
 }
 
@@ -525,25 +517,19 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
  * 
  * @return IPHONE_E_SUCCESS on success.
  */
-iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_b64, char **host_cert_b64,
-                                                                           char **root_cert_b64)
+iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * odevice_cert,
+                                                                           gnutls_datum_t * ohost_cert, gnutls_datum_t * oroot_cert)
 {
-        if (!public_key_b64 || !device_cert_b64 || !host_cert_b64 || !root_cert_b64)
+        if (!public_key.data || !odevice_cert || !ohost_cert || !oroot_cert)
                 return IPHONE_E_INVALID_ARG;
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
         gnutls_datum_t modulus = { NULL, 0 };
         gnutls_datum_t exponent = { NULL, 0 };
 
-        /* first decode base64 public_key */
-        gnutls_datum_t pem_pub_key;
-        gsize decoded_size;
-        pem_pub_key.data = g_base64_decode(public_key_b64, &decoded_size);
-        pem_pub_key.size = decoded_size;
-
         /* now decode the PEM encoded key */
         gnutls_datum_t der_pub_key;
-        if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &pem_pub_key, &der_pub_key)) {
+        if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &public_key, &der_pub_key)) {
 
                 /* initalize asn.1 parser */
                 ASN1_TYPE pkcs1 = ASN1_TYPE_EMPTY;
@@ -627,10 +613,18 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
                                 dev_pem.data = gnutls_malloc(dev_pem.size);
                                 gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_pem.data, &dev_pem.size);
 
-                                /* now encode certificates for output */
-                                *device_cert_b64 = g_base64_encode(dev_pem.data, dev_pem.size);
-                                *host_cert_b64 = g_base64_encode(pem_host_cert.data, pem_host_cert.size);
-                                *root_cert_b64 = g_base64_encode(pem_root_cert.data, pem_root_cert.size);
+                                /* copy buffer for output */
+                                odevice_cert->data = malloc(dev_pem.size);
+                                memcpy(odevice_cert->data, dev_pem.data, dev_pem.size);
+                                odevice_cert->size = dev_pem.size;
+
+                                ohost_cert->data = malloc(pem_host_cert.size);
+                                memcpy(ohost_cert->data, pem_host_cert.data, pem_host_cert.size);
+                                ohost_cert->size = pem_host_cert.size;
+
+                                oroot_cert->data = malloc(pem_root_cert.size);
+                                memcpy(oroot_cert->data, pem_root_cert.data, pem_root_cert.size);
+                                oroot_cert->size = pem_root_cert.size;
                         }
                         gnutls_free(pem_root_priv.data);
                         gnutls_free(pem_root_cert.data);
@@ -642,7 +636,6 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
         gnutls_free(exponent.data);
 
         gnutls_free(der_pub_key.data);
-        g_free(pem_pub_key.data);
 
         return ret;
 }
@@ -656,113 +649,112 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
  */
 iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const char *HostID)
 {
-        xmlDocPtr plist = new_plist();
-        xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
-        xmlNode *key;
-        char *what2send = NULL, **dictionary = NULL;
-        uint32 len = 0, bytes = 0, return_me = 0, i = 0;
+        plist_t dict = NULL;
+        char *XML_content = NULL;
+        uint32_t length = 0, bytes = 0, return_me = 0;
+
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
-        // end variables
 
-        key = add_key_str_dict_element(plist, dict, "HostID", HostID, 1);
-        if (!key) {
-                log_debug_msg("Couldn't add a key.\n");
-                xmlFreeDoc(plist);
-                return IPHONE_E_DICT_ERROR;
-        }
-        key = add_key_str_dict_element(plist, dict, "Request", "StartSession", 1);
-        if (!key) {
-                log_debug_msg("Couldn't add a key.\n");
-                xmlFreeDoc(plist);
-                return IPHONE_E_DICT_ERROR;
-        }
+        /* Setup DevicePublicKey request plist */
+        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);
 
-        xmlDocDumpMemory(plist, (xmlChar **) & what2send, &len);
-        ret = iphone_lckd_send(control, what2send, len, &bytes);
+        ret = iphone_lckd_send(control, XML_content, length, &bytes);
 
-        xmlFree(what2send);
-        xmlFreeDoc(plist);
+        free(XML_content);
+        XML_content = NULL;
+        plist_free(dict);
+        dict = NULL;
 
         if (ret != IPHONE_E_SUCCESS)
                 return ret;
 
         if (bytes > 0) {
-                ret = iphone_lckd_recv(control, &what2send, &len);
-                plist = xmlReadMemory(what2send, len, NULL, NULL, 0);
-                dict = xmlDocGetRootElement(plist);
+                ret = iphone_lckd_recv(control, &XML_content, &bytes);
+                log_debug_msg("Receive msg :\nsize : %i\nxml : %s", bytes, XML_content);
+                plist_from_xml(XML_content, bytes, &dict);
                 if (!dict)
-                        return IPHONE_E_DICT_ERROR;
-                for (dict = dict->children; dict; dict = dict->next) {
-                        if (!xmlStrcmp(dict->name, "dict"))
-                                break;
-                }
-                dictionary = read_dict_element_strings(dict);
-                xmlFreeDoc(plist);
-                free(what2send);
-                for (i = 0; dictionary[i]; i += 2) {
-                        if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
-                                // Set up GnuTLS...
-                                //gnutls_anon_client_credentials_t anoncred;
-                                gnutls_certificate_credentials_t xcred;
-
-                                log_debug_msg("We started the session OK, now trying GnuTLS\n");
-                                errno = 0;
-                                gnutls_global_init();
-                                //gnutls_anon_allocate_client_credentials(&anoncred);
-                                gnutls_certificate_allocate_credentials(&xcred);
-                                gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM);
-                                gnutls_init(control->ssl_session, GNUTLS_CLIENT);
-                                {
-                                        int protocol_priority[16] = { GNUTLS_SSL3, 0 };
-                                        int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
-                                        int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
-                                        int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
-                                        int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
-
-                                        gnutls_cipher_set_priority(*control->ssl_session, cipher_priority);
-                                        gnutls_compression_set_priority(*control->ssl_session, comp_priority);
-                                        gnutls_kx_set_priority(*control->ssl_session, kx_priority);
-                                        gnutls_protocol_set_priority(*control->ssl_session, protocol_priority);
-                                        gnutls_mac_set_priority(*control->ssl_session, mac_priority);
-
-                                }
-                                gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred);   // this part is killing me.
-
-                                log_debug_msg("GnuTLS step 1...\n");
-                                gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control);
-                                log_debug_msg("GnuTLS step 2...\n");
-                                gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite);
-                                log_debug_msg("GnuTLS step 3...\n");
-                                gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead);
-                                log_debug_msg("GnuTLS step 4 -- now handshaking...\n");
-
-                                if (errno)
-                                        log_debug_msg("WARN: errno says %s before handshake!\n", strerror(errno));
-                                return_me = gnutls_handshake(*control->ssl_session);
-                                log_debug_msg("GnuTLS handshake done...\n");
-
-                                free_dictionary(dictionary);
-
-                                if (return_me != GNUTLS_E_SUCCESS) {
-                                        log_debug_msg("GnuTLS reported something wrong.\n");
-                                        gnutls_perror(return_me);
-                                        log_debug_msg("oh.. errno says %s\n", strerror(errno));
-                                        return IPHONE_E_SSL_ERROR;
-                                } else {
-                                        control->in_SSL = 1;
-                                        return IPHONE_E_SUCCESS;
-                                }
+                        return IPHONE_E_PLIST_ERROR;
+
+                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;
+                char *result_key = NULL;
+                char *result_value = NULL;
+                uint64_t key_length = 0;
+                uint64_t val_length = 0;
+
+                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;
+                plist_free(dict);
+                dict = NULL;
+
+                if (result_key_type == PLIST_KEY &&
+                        result_value_type == PLIST_STRING && !strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
+                        // Set up GnuTLS...
+                        //gnutls_anon_client_credentials_t anoncred;
+                        gnutls_certificate_credentials_t xcred;
+
+                        log_debug_msg("We started the session OK, now trying GnuTLS\n");
+                        errno = 0;
+                        gnutls_global_init();
+                        //gnutls_anon_allocate_client_credentials(&anoncred);
+                        gnutls_certificate_allocate_credentials(&xcred);
+                        gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM);
+                        gnutls_init(control->ssl_session, GNUTLS_CLIENT);
+                        {
+                                int protocol_priority[16] = { GNUTLS_SSL3, 0 };
+                                int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
+                                int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
+                                int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
+                                int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
+
+                                gnutls_cipher_set_priority(*control->ssl_session, cipher_priority);
+                                gnutls_compression_set_priority(*control->ssl_session, comp_priority);
+                                gnutls_kx_set_priority(*control->ssl_session, kx_priority);
+                                gnutls_protocol_set_priority(*control->ssl_session, protocol_priority);
+                                gnutls_mac_set_priority(*control->ssl_session, mac_priority);
+
+                        }
+                        gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred);   // this part is killing me.
+
+                        log_debug_msg("GnuTLS step 1...\n");
+                        gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control);
+                        log_debug_msg("GnuTLS step 2...\n");
+                        gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite);
+                        log_debug_msg("GnuTLS step 3...\n");
+                        gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead);
+                        log_debug_msg("GnuTLS step 4 -- now handshaking...\n");
+
+                        if (errno)
+                                log_debug_msg("WARN: errno says %s before handshake!\n", strerror(errno));
+                        return_me = gnutls_handshake(*control->ssl_session);
+                        log_debug_msg("GnuTLS handshake done...\n");
+
+                        if (return_me != GNUTLS_E_SUCCESS) {
+                                log_debug_msg("GnuTLS reported something wrong.\n");
+                                gnutls_perror(return_me);
+                                log_debug_msg("oh.. errno says %s\n", strerror(errno));
+                                return IPHONE_E_SSL_ERROR;
+                        } else {
+                                control->in_SSL = 1;
+                                return IPHONE_E_SUCCESS;
                         }
                 }
 
                 log_debug_msg("Apparently failed negotiating with lockdownd.\n");
                 log_debug_msg("Responding dictionary: \n");
-                for (i = 0; dictionary[i]; i += 2) {
-                        log_debug_msg("\t%s: %s\n", dictionary[i], dictionary[i + 1]);
-                }
-
-
-                free_dictionary(dictionary);
                 return IPHONE_E_SSL_ERROR;
         } else {
                 log_debug_msg("Didn't get enough bytes.\n");
@@ -894,81 +886,90 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
         if (!client->in_SSL && !lockdownd_start_SSL_session(client, host_id))
                 return IPHONE_E_SSL_ERROR;
 
-        char *XML_query, **dictionary;
-        uint32 length, i = 0, port_loc = 0, bytes = 0;
-        uint8 result = 0;
+
+        plist_t dict = NULL;
+        char *XML_content = NULL;
+        uint32_t length, i = 0, port_loc = 0, bytes = 0;
         iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
 
         free(host_id);
         host_id = NULL;
 
-        xmlDocPtr plist = new_plist();
-        xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
-        xmlNode *key;
-        key = add_key_str_dict_element(plist, dict, "Request", "StartService", 1);
-        if (!key) {
-                xmlFreeDoc(plist);
-                return IPHONE_E_UNKNOWN_ERROR;
-        }
-        key = add_key_str_dict_element(plist, dict, "Service", service, 1);
-        if (!key) {
-                xmlFreeDoc(plist);
-                return IPHONE_E_UNKNOWN_ERROR;
-        }
+        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);
 
-        xmlDocDumpMemory(plist, (xmlChar **) & XML_query, &length);
+        /* send to iPhone */
+        log_debug_msg("Send msg :\nsize : %i\nxml : %s", length, XML_content);
+        ret = iphone_lckd_send(client, XML_content, length, &bytes);
+
+        free(XML_content);
+        XML_content = NULL;
+        plist_free(dict);
+        dict = NULL;
 
-        ret = iphone_lckd_send(client, XML_query, length, &bytes);
-        free(XML_query);
         if (IPHONE_E_SUCCESS != ret)
                 return ret;
 
-        ret = iphone_lckd_recv(client, &XML_query, &bytes);
-        xmlFreeDoc(plist);
+        ret = iphone_lckd_recv(client, &XML_content, &bytes);
+
         if (IPHONE_E_SUCCESS != ret)
                 return ret;
 
+        plist_from_xml(XML_content, bytes, &dict);
+        if (!dict)
+                return IPHONE_E_PLIST_ERROR;
+
+
         if (bytes <= 0)
                 return IPHONE_E_NOT_ENOUGH_DATA;
         else {
-                plist = xmlReadMemory(XML_query, bytes, NULL, NULL, 0);
-                if (!plist)
-                        return IPHONE_E_UNKNOWN_ERROR;
-                dict = xmlDocGetRootElement(plist);
-                if (!dict)
-                        return IPHONE_E_UNKNOWN_ERROR;
-                for (dict = dict->children; dict; dict = dict->next) {
-                        if (!xmlStrcmp(dict->name, "dict"))
-                                break;
-                }
 
-                if (!dict)
-                        return IPHONE_E_UNKNOWN_ERROR;
-                dictionary = read_dict_element_strings(dict);
-
-                for (i = 0; dictionary[i]; i += 2) {
-                        log_debug_msg("lockdownd_start_service() dictionary %s: %s\n", dictionary[i], dictionary[i + 1]);
-
-                        if (!xmlStrcmp(dictionary[i], "Port")) {
-                                port_loc = atoi(dictionary[i + 1]);
-                                log_debug_msg("lockdownd_start_service() atoi'd port: %i\n", port);
-                        }
-
-                        if (!xmlStrcmp(dictionary[i], "Result")) {
-                                if (!xmlStrcmp(dictionary[i + 1], "Success")) {
-                                        result = 1;
-                                }
-                        }
+                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 = 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;
+                plist_type port_key_type;
+                plist_type port_value_type;
+                char *result_key = NULL;
+                char *result_value = NULL;
+                char *port_key = NULL;
+                uint64_t res_key_length = 0;
+                uint64_t res_val_length = 0;
+                uint64_t port_key_length = 0;
+                uint64_t port_val_length = 0;
+                uint64_t port_value = 0;
+
+                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 &&
+                        port_key_type == PLIST_KEY &&
+                        port_value_type == PLIST_UINT &&
+                        !strcmp(result_key, "Result") && !strcmp(result_value, "Success") && !strcmp(port_key, "Port")) {
+                        port_loc = port_value;
+                        ret = IPHONE_E_SUCCESS;
                 }
 
                 log_debug_msg("lockdownd_start_service(): DATA RECEIVED:\n\n");
-                log_debug_msg(XML_query);
+                log_debug_msg(XML_content);
                 log_debug_msg("end data received by lockdownd_start_service()\n");
 
-                free(XML_query);
-                xmlFreeDoc(plist);
-                free_dictionary(dictionary);
-                if (port && result) {
+                free(XML_content);
+                plist_free(dict);
+                dict = NULL;
+                if (port && ret == IPHONE_E_SUCCESS) {
                         *port = port_loc;
                         return IPHONE_E_SUCCESS;
                 } else