diff options
| author |  Jonathan Beck | 2009-01-04 22:21:15 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-04 22:21:15 +0100 |
| commit | 5514a3b2a9734d311e4f6014585f922e0b748cab (patch) | |
| tree | ca88a32519d6a07da72d15632de7af04461f7ba8 /src/lockdown.c | |
| parent | 4301ef9bb8e9d06ffa4e9172191d58ede5e16f5d (diff) | |
| parent | 5cde55426112a8cb79d809dae5f61e347c007212 (diff) | |
| download | libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.gz libimobiledevice-5514a3b2a9734d311e4f6014585f922e0b748cab.tar.bz2 | |
Merge branch 'master' into plist
Conflicts:
src/AFC.c
src/lockdown.c
src/lockdown.h
src/plist.c
src/plist.h
Diffstat (limited to 'src/lockdown.c')
| -rw-r--r-- | src/lockdown.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lockdown.c b/src/lockdown.c index 5b83fb9..c6d5f80 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -20,6 +20,7 @@ */ #include "usbmux.h" +#include "utils.h" #include "iphone.h" #include "lockdown.h" #include "userpref.h" @@ -41,8 +42,6 @@ const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = { {0, 0, 0} }; - - /** Creates a lockdownd client for the give iPhone. * * @param phone The iPhone to create a lockdownd client for @@ -235,7 +234,7 @@ 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, char *req_key, char *req_string, +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->data) |