summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/AFC.c51
-rw-r--r--src/AFC.h10
-rw-r--r--src/Makefile.am8
-rw-r--r--src/initconf.c30
-rw-r--r--src/lockdown.c810
-rw-r--r--src/lockdown.h15
-rw-r--r--src/plist.c245
-rw-r--r--src/plist.h38
-rw-r--r--src/usbmux.c2
-rw-r--r--src/usbmux.h20
-rw-r--r--src/userpref.c10
-rw-r--r--src/userpref.h2
12 files changed, 499 insertions, 742 deletions
diff --git a/src/AFC.c b/src/AFC.c
index 6027ed2..a1f7a08 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -21,8 +21,7 @@
#include <stdio.h>
#include "AFC.h"
-#include "plist.h"
-#include "utils.h"
+
// This is the maximum size an AFC data packet can be
@@ -246,7 +245,7 @@ static int receive_AFC_data(iphone_afc_client_t client, char **dump_here)
return retval;
}
- uint32 param1 = buffer[sizeof(AFCPacket)];
+ uint32_t param1 = buffer[sizeof(AFCPacket)];
free(buffer);
if (r_packet->operation == AFC_ERROR && !(client->afc_packet->operation == AFC_DELETE && param1 == 7)) {
@@ -475,7 +474,7 @@ iphone_error_t iphone_afc_delete_file(iphone_afc_client_t client, const char *pa
iphone_error_t iphone_afc_rename_file(iphone_afc_client_t client, const char *from, const char *to)
{
char *response = NULL;
- char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32)));
+ char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32_t)));
int bytes = 0;
if (!client || !from || !to || !client->afc_packet || !client->connection)
@@ -661,7 +660,7 @@ iphone_afc_open_file(iphone_afc_client_t client, const char *filename,
iphone_afc_file_mode_t file_mode, iphone_afc_file_t * file)
{
iphone_afc_file_t file_loc = NULL;
- uint32 ag = 0;
+ uint32_t ag = 0;
int bytes = 0, length = 0;
char *data = (char *) malloc(sizeof(char) * (8 + strlen(filename) + 1));
@@ -796,8 +795,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
{
char *acknowledgement = NULL;
const int MAXIMUM_WRITE_SIZE = 1 << 15;
- uint32 zero = 0, current_count = 0, i = 0;
- uint32 segments = (length / MAXIMUM_WRITE_SIZE);
+ uint32_t zero = 0, current_count = 0, i = 0;
+ uint32_t segments = (length / MAXIMUM_WRITE_SIZE);
int bytes_loc = 0;
char *out_buffer = NULL;
@@ -815,8 +814,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
client->afc_packet->entire_length = client->afc_packet->this_length + MAXIMUM_WRITE_SIZE;
client->afc_packet->operation = AFC_WRITE;
out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
- memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32));
- memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32));
+ memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
+ memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
memcpy(out_buffer + 8, data + current_count, MAXIMUM_WRITE_SIZE);
bytes_loc = dispatch_AFC_packet(client, out_buffer, MAXIMUM_WRITE_SIZE + 8);
if (bytes_loc < 0) {
@@ -848,8 +847,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
client->afc_packet->entire_length = client->afc_packet->this_length + (length - current_count);
client->afc_packet->operation = AFC_WRITE;
out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
- memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32));
- memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32));
+ memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
+ memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
memcpy(out_buffer + 8, data + current_count, (length - current_count));
bytes_loc = dispatch_AFC_packet(client, out_buffer, (length - current_count) + 8);
free(out_buffer);
@@ -884,7 +883,7 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
if (!client || !file)
return IPHONE_E_INVALID_ARG;
char *buffer = malloc(sizeof(char) * 8);
- uint32 zero = 0;
+ uint32_t zero = 0;
int bytes = 0;
afc_lock(client);
@@ -892,8 +891,8 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
log_debug_msg("afc_close_file: File handle %i\n", file->filehandle);
// Send command
- memcpy(buffer, &file->filehandle, sizeof(uint32));
- memcpy(buffer + sizeof(uint32), &zero, sizeof(zero));
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t));
+ memcpy(buffer + sizeof(uint32_t), &zero, sizeof(zero));
client->afc_packet->operation = AFC_FILE_CLOSE;
client->afc_packet->entire_length = client->afc_packet->this_length = 0;
bytes = dispatch_AFC_packet(client, buffer, sizeof(char) * 8);
@@ -929,7 +928,7 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_t file, int seekpos)
{
char *buffer = (char *) malloc(sizeof(char) * 24);
- uint32 seekto = 0, zero = 0;
+ uint32_t seekto = 0, zero = 0;
int bytes = 0;
if (seekpos < 0)
@@ -939,12 +938,12 @@ iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_
// Send the command
seekto = seekpos;
- memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle
- memcpy(buffer + 4, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 8, &zero, sizeof(uint32)); // fromwhere
- memcpy(buffer + 12, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 16, &seekto, sizeof(uint32)); // offset
- memcpy(buffer + 20, &zero, sizeof(uint32)); // pad
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
+ memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 8, &zero, sizeof(uint32_t)); // fromwhere
+ memcpy(buffer + 12, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 16, &seekto, sizeof(uint32_t)); // offset
+ memcpy(buffer + 20, &zero, sizeof(uint32_t)); // pad
client->afc_packet->operation = AFC_FILE_SEEK;
client->afc_packet->this_length = client->afc_packet->entire_length = 0;
bytes = dispatch_AFC_packet(client, buffer, 23);
@@ -984,14 +983,14 @@ iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_f
{
char *buffer = (char *) malloc(sizeof(char) * 16);
int bytes = 0;
- uint32 zero = 0;
+ uint32_t zero = 0;
afc_lock(client);
// Send command
- memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle
- memcpy(buffer + 4, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 8, &newsize, sizeof(uint32)); // newsize
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
+ memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 8, &newsize, sizeof(uint32_t)); // newsize
memcpy(buffer + 12, &zero, 3); // pad
client->afc_packet->operation = AFC_FILE_TRUNCATE;
client->afc_packet->this_length = client->afc_packet->entire_length = 0;
@@ -1017,7 +1016,7 @@ iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_f
}
}
-uint32 iphone_afc_get_file_handle(iphone_afc_file_t file)
+uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file)
{
return file->filehandle;
}
diff --git a/src/AFC.h b/src/AFC.h
index 463c13e..5e4d17c 100644
--- a/src/AFC.h
+++ b/src/AFC.h
@@ -29,12 +29,12 @@
#include <glib.h>
typedef struct {
- uint32 header1, header2;
- uint32 entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4;
+ uint32_t header1, header2;
+ uint32_t entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4;
} AFCPacket;
typedef struct {
- uint32 filehandle, unknown1, size, unknown2;
+ uint32_t filehandle, unknown1, size, unknown2;
} AFCFilePacket;
typedef struct __AFCToken {
@@ -51,7 +51,7 @@ struct iphone_afc_client_int {
};
struct iphone_afc_file_int {
- uint32 filehandle, blocks, size, type;
+ uint32_t filehandle, blocks, size, type;
};
@@ -74,4 +74,4 @@ enum {
AFC_WRITE = 0x00000010
};
-uint32 iphone_afc_get_file_handle(iphone_afc_file_t file);
+uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file);
diff --git a/src/Makefile.am b/src/Makefile.am
index 785aacf..2514367 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
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
-libiphone_initconf_SOURCES = initconf.c userpref.c lockdown.c plist.c usbmux.c iphone.c utils.c
+libiphone_initconf_SOURCES = initconf.c userpref.c utils.c
libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS)
libiphone_initconf_LDFLAGS = $(libgthread2_LIBS) $(AM_LDFLAGS)
lib_LTLIBRARIES = libiphone.la
-libiphone_la_SOURCES = usbmux.c iphone.c plist.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/initconf.c b/src/initconf.c
index 205c97a..538f344 100644
--- a/src/initconf.c
+++ b/src/initconf.c
@@ -28,7 +28,6 @@
#include "libiphone/libiphone.h"
#include "userpref.h"
-#include "lockdown.h"
#include "utils.h"
/** Generates a 2048 byte key, split into a function so that it can be run in a
@@ -60,6 +59,35 @@ static void progress_bar(gpointer mutex)
g_thread_exit(0);
}
+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()
+{
+ 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;
+}
+
int main(int argc, char *argv[])
{
GThread *progress_thread, *key_thread;
diff --git a/src/lockdown.c b/src/lockdown.c
index ab168a3..872b7b0 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
@@ -101,59 +74,64 @@ iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone)
static void iphone_lckd_stop_session(iphone_lckd_client_t control)
{
if (!control)
- return; // IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict, *key;
- char **dictionary;
+ return; //IPHONE_E_INVALID_ARG;
+
int bytes = 0, i = 0;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- log_debug_msg("lockdownd_stop_session() called\n");
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, "Request", "StopSession", 1);
- key = add_key_str_dict_element(plist, dict, "SessionID", control->session_id, 1);
+ 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 *) "StopSession", strlen("StopSession"));
+ plist_add_sub_element(dict, PLIST_KEY, (void *) "SessionID", strlen("SessionID"));
+ plist_add_sub_element(dict, PLIST_STRING, (void *) control->session_id, strlen(control->session_id));
- char *XML_content;
- uint32 length;
+ log_debug_msg("iphone_lckd_stop_session() called\n");
+ 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) {
- fprintf(stderr, "lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
- return; //IPHONE_E_PLIST_ERROR;
- }
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
if (!dict) {
- fprintf(stderr, "lockdownd_stop_session(): IPHONE_E_DICT_ERROR\n");
- return; //IPHONE_E_DICT_ERROR;
+ log_debug_msg("lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
+ return; // IPHONE_E_PLIST_ERROR;
}
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- log_debug_msg("lockdownd_stop_session(): success\n");
- ret = IPHONE_E_SUCCESS;
- break;
- }
+ plist_t query_node = plist_find_node(dict, PLIST_STRING, "StopSession", strlen("StopSession"));
+ 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_stop_session(): success\n");
+ ret = IPHONE_E_SUCCESS;
}
- free_dictionary(dictionary);
- return; //ret;
+ return; // ret;
}
+
/**
* Shuts down the SSL session by first calling iphone_lckd_stop_session
* to cleanly close the lockdownd communication session, and then
@@ -184,6 +162,7 @@ static void iphone_lckd_stop_SSL_session(iphone_lckd_client_t client)
return;
}
+
/** Closes the lockdownd client and does the necessary housekeeping.
*
* @param control The lockdown client
@@ -223,7 +202,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);
@@ -297,49 +276,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;
}
@@ -351,74 +336,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;
}
@@ -430,7 +435,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.
@@ -439,7 +446,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);
}
@@ -511,51 +518,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;
@@ -570,48 +578,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;
- if (dictionary) {
- free_dictionary(dictionary);
- dictionary = NULL;
+ 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")) {
+ 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;
}
@@ -624,55 +623,59 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
void lockdownd_close(iphone_lckd_client_t control)
{
if (!control)
- return; // IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict, *key;
- char **dictionary;
+ return; //IPHONE_E_INVALID_ARG;
+
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 *) "Goodbye", strlen("Goodbye"));
+
log_debug_msg("lockdownd_close() called\n");
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, "Request", "Goodbye", 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) {
- fprintf(stderr, "lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
- return; //IPHONE_E_PLIST_ERROR;
- }
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
if (!dict) {
- fprintf(stderr, "lockdownd_close(): IPHONE_E_DICT_ERROR\n");
- return; //IPHONE_E_DICT_ERROR;
+ log_debug_msg("lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
+ return; // IPHONE_E_PLIST_ERROR;
}
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- log_debug_msg("lockdownd_close(): success\n");
- ret = IPHONE_E_SUCCESS;
- break;
- }
+ plist_t query_node = plist_find_node(dict, PLIST_STRING, "Goodbye", strlen("Goodbye"));
+ 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_close(): success\n");
+ ret = IPHONE_E_SUCCESS;
}
- free_dictionary(dictionary);
- return; //ret;
+ return; // ret;
}
/** Generates the device certificate from the public key as well as the host
@@ -680,25 +683,19 @@ void lockdownd_close(iphone_lckd_client_t control)
*
* @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;
@@ -782,10 +779,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);
@@ -797,7 +802,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;
}
@@ -811,124 +815,135 @@ 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;
- iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- // end variables
+ 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;
control->session_id[0] = '\0';
- 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);
+ 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;
ret = IPHONE_E_SSL_ERROR;
- 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");
-
- 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;
- ret = IPHONE_E_SUCCESS;
- }
- } else if (!strcmp(dictionary[i], "SessionID")) {
+ 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;
+ ret = IPHONE_E_SUCCESS;
+ }
+ }
+ //store session id
+ plist_t session_node = plist_find_node(dict, PLIST_KEY, "SessionID", strlen("SessionID"));
+ if (session_node) {
+
+ plist_type session_node_val_type;
+ char *session_id = NULL;
+ uint64_t session_id_length = 0;
+ plist_t session_node_val = plist_get_next_sibling(session_node);
+
+ plist_get_type_and_value(session_node_val, &session_node_val_type, (void *) (&session_id),
+ &session_id_length);
+ if (session_node_val_type == PLIST_STRING && session_id_length > 0) {
// we need to store the session ID for StopSession
- strcpy(control->session_id, dictionary[i + 1]);
+ strcpy(control->session_id, session_id);
log_debug_msg("SessionID: %s\n", control->session_id);
- free_dictionary(dictionary);
return ret;
}
}
+
if (ret == IPHONE_E_SUCCESS) {
log_debug_msg("Failed to get SessionID!\n");
return ret;
}
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");
@@ -1060,81 +1075,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);
+
+ /* send to iPhone */
+ log_debug_msg("Send msg :\nsize : %i\nxml : %s", length, XML_content);
+ ret = iphone_lckd_send(client, XML_content, length, &bytes);
- xmlDocDumpMemory(plist, (xmlChar **) & XML_query, &length);
+ 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
diff --git a/src/lockdown.h b/src/lockdown.h
index 8b4f27c..cdc46b8 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>
@@ -41,18 +40,16 @@ struct iphone_lckd_client_int {
char session_id[40];
};
-char *lockdownd_generate_hostid(void);
-
iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone);
iphone_error_t lockdownd_hello(iphone_lckd_client_t control);
-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);
iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid);
-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);
-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_pair_device(iphone_lckd_client_t control, char *public_key, char *host_id);
+iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * device_cert,
+ gnutls_datum_t * host_cert, gnutls_datum_t * root_cert);
+iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id);
void lockdownd_close(iphone_lckd_client_t control);
// SSL functions
diff --git a/src/plist.c b/src/plist.c
deleted file mode 100644
index b9d9e6a..0000000
--- a/src/plist.c
+++ /dev/null
@@ -1,245 +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 <libxml/parser.h>
-#include <libxml/tree.h>
-#include <string.h>
-#include <assert.h>
-#include "plist.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.
- */
-static 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;
-}
-
-/** Creates a new plist XML document.
- *
- * @return The plist XML document.
- */
-xmlDocPtr new_plist(void)
-{
- 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);
-}
-
-/** Adds a new node as a child to a given node.
- *
- * This is a lower level function so you probably want to use
- * add_key_str_dict_element, add_key_dict_node or add_key_data_dict_element
- * instead.
- *
- * @param plist The plist XML document to which the to_node belongs.
- * @param name The name of the new node.
- * @param content The string containing the text node of the new node.
- * @param to_node The node to attach the child node to. If none is given, the
- * root node of the given document is used.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created node.
- */
-xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth)
-{
- int i = 0;
- xmlNode *child;
-
- if (!plist)
- return NULL;
- assert(depth >= 0);
- if (!to_node)
- to_node = xmlDocGetRootElement(plist);
-
- for (i = 0; i < depth; i++) {
- xmlNodeAddContent(to_node, "\t");
- }
- child = xmlNewChild(to_node, NULL, name, content);
- xmlNodeAddContent(to_node, "\n");
-
- return child;
-}
-
-/** Adds a string key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created key node.
- */
-xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *keyPtr;
-
- keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
- add_child_to_plist(plist, "string", value, dict, depth);
-
- return keyPtr;
-}
-
-/** Adds a new dictionary key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created dict node.
- */
-xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *child;
-
- add_child_to_plist(plist, "key", key, dict, depth);
- child = add_child_to_plist(plist, "dict", value, dict, depth);
-
- return child;
-}
-
-/** Adds a new data dictionary key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created key node.
- */
-xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *keyPtr;
-
- keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
- add_child_to_plist(plist, "data", format_string(value, 60, depth), dict, depth);
-
- return keyPtr;
-}
-
-/** Reads a set of keys and strings into an array from a plist XML document.
- *
- * @param dict The root XMLNode of a plist XML document to be read.
- *
- * @return An array where each even number is a key and the odd numbers are
- * values. If the odd number is \0, that's the end of the list.
- */
-char **read_dict_element_strings(xmlNode * dict)
-{
- char **return_me = NULL, **old = NULL;
- int current_length = 0;
- int current_pos = 0;
- xmlNode *dict_walker;
-
- for (dict_walker = dict->children; dict_walker; dict_walker = dict_walker->next) {
- if (!xmlStrcmp(dict_walker->name, "key")) {
- current_length += 2;
- old = return_me;
- return_me = realloc(return_me, sizeof(char *) * current_length);
- if (!return_me) {
- free(old);
- return NULL;
- }
- return_me[current_pos++] = xmlNodeGetContent(dict_walker);
- return_me[current_pos++] = xmlNodeGetContent(dict_walker->next->next);
- }
- }
-
- old = return_me;
- return_me = realloc(return_me, sizeof(char *) * (current_length + 1));
- return_me[current_pos] = NULL;
-
- return return_me;
-}
-
-/** Destroys a dictionary as returned by read_dict_element_strings
- */
-void free_dictionary(char **dictionary)
-{
- int i = 0;
-
- if (!dictionary)
- return;
-
- for (i = 0; dictionary[i]; i++) {
- free(dictionary[i]);
- }
-
- free(dictionary);
-}
diff --git a/src/plist.h b/src/plist.h
deleted file mode 100644
index cd2028e..0000000
--- a/src/plist.h
+++ /dev/null
@@ -1,38 +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 <libxml/parser.h>
-#include <libxml/tree.h>
-
-xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth);
-
-void free_plist(xmlDocPtr plist);
-xmlDocPtr new_plist(void);
-
-char **read_dict_element_strings(xmlNode * dict);
-void free_dictionary(char **dictionary);
-#endif
diff --git a/src/usbmux.c b/src/usbmux.c
index c7ac7ef..eb7ec97 100644
--- a/src/usbmux.c
+++ b/src/usbmux.c
@@ -38,7 +38,7 @@ static int clients = 0;
*
* @return A USBMux packet
*/
-usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port)
+usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port)
{
usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header));
conn->type = htonl(6);
diff --git a/src/usbmux.h b/src/usbmux.h
index fd5fc78..bea83f7 100644
--- a/src/usbmux.h
+++ b/src/usbmux.h
@@ -22,6 +22,7 @@
#include <sys/types.h>
#include <stdlib.h>
#include <stdint.h>
+#include "libiphone/libiphone.h"
#ifndef USBMUX_H
#define USBMUX_H
@@ -30,17 +31,12 @@
#include "iphone.h"
#endif
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint8_t uint8;
-
-
typedef struct {
- uint32 type, length;
- uint16 sport, dport;
- uint32 scnt, ocnt;
- uint8 offset, tcp_flags;
- uint16 window, nullnull, length16;
+ uint32_t type, length;
+ uint16_t sport, dport;
+ uint32_t scnt, ocnt;
+ uint8_t offset, tcp_flags;
+ uint16_t window, nullnull, length16;
} usbmux_tcp_header;
struct iphone_umux_client_int {
@@ -50,10 +46,10 @@ struct iphone_umux_client_int {
int r_len;
};
-usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port);
+usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port);
typedef struct {
- uint32 type, length, major, minor, allnull;
+ uint32_t type, length, major, minor, allnull;
} usbmux_version_header;
usbmux_version_header *version_header(void);
diff --git a/src/userpref.c b/src/userpref.c
index 5f227b0..3e5eb06 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -111,10 +111,10 @@ int is_device_known(char *uid)
* @return 1 on success and 0 if no public key is given or if it has already
* been marked as connected previously.
*/
-int store_device_public_key(char *uid, char *public_key)
+int store_device_public_key(char *uid, gnutls_datum_t public_key)
{
- if (NULL == public_key || is_device_known(uid))
+ if (NULL == public_key.data || is_device_known(uid))
return 0;
/* ensure config directory exists */
@@ -124,15 +124,11 @@ int store_device_public_key(char *uid, char *public_key)
gchar *device_file = g_strconcat(uid, ".pem", NULL);
gchar *pem = g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, device_file, NULL);
- /* decode public key for storing */
- gsize decoded_size;
- gchar *data = g_base64_decode(public_key, &decoded_size);
/* store file */
FILE *pFile = fopen(pem, "wb");
- fwrite(data, 1, decoded_size, pFile);
+ fwrite(public_key.data, 1, public_key.size, pFile);
fclose(pFile);
g_free(pem);
- g_free(data);
g_free(device_file);
return 1;
}
diff --git a/src/userpref.h b/src/userpref.h
index e7835d0..7e606eb 100644
--- a/src/userpref.h
+++ b/src/userpref.h
@@ -40,7 +40,7 @@ int is_device_known(char *uid);
/**
* @return 1 if everything went well. Returns 0 otherwise.
*/
-int store_device_public_key(char *uid, char *public_key);
+int store_device_public_key(char *uid, gnutls_datum_t public_key);
/**
* @return 1 if everything went well. Returns 0 otherwise.