summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2013-10-02 19:17:42 +0200
committerGravatar Nikias Bassen2013-10-02 19:17:42 +0200
commit4f6e61eb9ec0af09a85bcbd83e6897782eb669aa (patch)
treebb562edf3c0de0e6ef109a5ade9c82e6ede0b32d
parentd37b4c3740acfbfda28b334498d01fd56be0ff38 (diff)
downloadidevicerestore-4f6e61eb9ec0af09a85bcbd83e6897782eb669aa.tar.gz
idevicerestore-4f6e61eb9ec0af09a85bcbd83e6897782eb669aa.tar.bz2
dfu: make sure buffers are of type unsigned char*
-rw-r--r--src/dfu.c12
-rw-r--r--src/dfu.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/dfu.c b/src/dfu.c
index 6217ec3..e38ddb0 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -134,7 +134,7 @@ const char* dfu_check_product_type(struct idevicerestore_client_t* client) {
return device->product_type;
}
-int dfu_send_buffer(struct idevicerestore_client_t* client, char* buffer, uint32_t size)
+int dfu_send_buffer(struct idevicerestore_client_t* client, unsigned char* buffer, unsigned int size)
{
irecv_error_t err = 0;
@@ -159,9 +159,9 @@ int dfu_send_buffer(struct idevicerestore_client_t* client, char* buffer, uint32
int dfu_send_component(struct idevicerestore_client_t* client, plist_t build_identity, const char* component) {
uint32_t size = 0;
- char* data = NULL;
+ unsigned char* data = NULL;
char* path = NULL;
- char* blob = NULL;
+ unsigned char* blob = NULL;
irecv_error_t err = 0;
int flag = 1;
@@ -186,8 +186,8 @@ int dfu_send_component(struct idevicerestore_client_t* client, plist_t build_ide
}
if (!(client->flags & FLAG_CUSTOM) && (strcmp(component, "iBEC") == 0)) {
- char* ticket = NULL;
- uint32_t tsize = 0;
+ unsigned char* ticket = NULL;
+ unsigned int tsize = 0;
if (tss_get_ticket(client->tss, &ticket, &tsize) < 0) {
error("ERROR: Unable to get ApTicket from TSS request\n");
return -1;
@@ -197,7 +197,7 @@ int dfu_send_component(struct idevicerestore_client_t* client, plist_t build_ide
fillsize = ((tsize / 0x100) + 1) * 0x100;
}
debug("ticket size = %d\nfillsize = %d\n", tsize, fillsize);
- char* newdata = (char*)malloc(size + fillsize);
+ unsigned char* newdata = (unsigned char*)malloc(size + fillsize);
memcpy(newdata, ticket, tsize);
memset(newdata+tsize, '\xFF', fillsize - tsize);
memcpy(newdata+fillsize, data, size);
diff --git a/src/dfu.h b/src/dfu.h
index 3f5ea1c..8b57022 100644
--- a/src/dfu.h
+++ b/src/dfu.h
@@ -41,7 +41,7 @@ int dfu_client_new(struct idevicerestore_client_t* client);
void dfu_client_free(struct idevicerestore_client_t* client);
int dfu_check_mode(struct idevicerestore_client_t* client, int* mode);
const char* dfu_check_product_type(struct idevicerestore_client_t* client);
-int dfu_send_buffer(struct idevicerestore_client_t* client, char* buffer, uint32_t size);
+int dfu_send_buffer(struct idevicerestore_client_t* client, unsigned char* buffer, unsigned int size);
int dfu_send_component(struct idevicerestore_client_t* client, plist_t build_identity, const char* component);
int dfu_get_cpid(struct idevicerestore_client_t* client, unsigned int* cpid);
int dfu_get_nonce(struct idevicerestore_client_t* client, unsigned char** nonce, int* nonce_size);