Merged in Jonathan's libplist libiphone. [#2 state:resolved]

1 files changed, 10 insertions, 11 deletions

diff --git a/src/lockdown.h b/src/lockdown.h
index c30a182..7485006 100644
--- a/src/lockdown.h
+++ b/src/lockdown.h
@@ -8,22 +8,21 @@
  * 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 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef LOCKDOWND_H
 #define LOCKDOWND_H
 
 #include "usbmux.h"
-#include "plist.h"
 
 #include <gnutls/gnutls.h>
 #include <string.h>
@@ -39,17 +38,17 @@ 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_get_device_public_key(iphone_lckd_client_t control, char **public_key);
+										   gnutls_datum_t * value);
+
+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