updated libirecovery to the latest version from greenpois0n. it at least compiles on osx now, I need to test on other systems

1 files changed, 0 insertions, 672 deletions

diff --git a/src/libirecovery.c b/src/libirecovery.c
deleted file mode 100644
index dd5c734..0000000
--- a/src/libirecovery.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/**
- * iRecovery - Utility for DFU 2.0, WTF and Recovery Mode
- * Copyright (C) 2008 - 2009 westbaer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <libusb-1.0/libusb.h>
-
-#include "libirecovery.h"
-
-#define BUFFER_SIZE 0x1000
-#define debug(...) if(libirecovery_debug) fprintf(stderr, __VA_ARGS__)
-
-static int libirecovery_debug = 0;
-static libusb_context* libirecovery_context = NULL;
-
-int irecv_write_file(const char* filename, const void* data, size_t size);
-int irecv_read_file(const char* filename, char** data, uint32_t* size);
-
-irecv_error_t irecv_open(irecv_client_t* pclient) {
-	int i = 0;
-	char serial[256];
-	struct libusb_device* usb_device = NULL;
-	struct libusb_device** usb_device_list = NULL;
-	struct libusb_device_handle* usb_handle = NULL;
-	struct libusb_device_descriptor usb_descriptor;
-
-	*pclient = NULL;
-	libusb_init(&libirecovery_context);
-	if(libirecovery_debug) {
-		irecv_set_debug_level(libirecovery_debug);
-	}
-
-	irecv_error_t error = IRECV_E_SUCCESS;
-	int usb_device_count = libusb_get_device_list(libirecovery_context, &usb_device_list);
-	for (i = 0; i < usb_device_count; i++) {
-		usb_device = usb_device_list[i];
-		libusb_get_device_descriptor(usb_device, &usb_descriptor);
-		if (usb_descriptor.idVendor == APPLE_VENDOR_ID) {
-			/* verify this device is in a mode we understand */
-			if (usb_descriptor.idProduct == kRecoveryMode1 ||
-				usb_descriptor.idProduct == kRecoveryMode2 ||
-				usb_descriptor.idProduct == kRecoveryMode3 ||
-				usb_descriptor.idProduct == kRecoveryMode4 ||
-				usb_descriptor.idProduct == kDfuMode) {
-
-				libusb_open(usb_device, &usb_handle);
-				if (usb_handle == NULL) {
-					libusb_free_device_list(usb_device_list, 1);
-					libusb_close(usb_handle);
-					libusb_exit(libirecovery_context);
-					return IRECV_E_UNABLE_TO_CONNECT;
-				}
-				libusb_free_device_list(usb_device_list, 1);
-
-				irecv_client_t client = (irecv_client_t) malloc(sizeof(struct irecv_client));
-				if (client == NULL) {
-					libusb_close(usb_handle);
-					libusb_exit(libirecovery_context);
-					return IRECV_E_OUT_OF_MEMORY;
-				}
-
-				memset(client, '\0', sizeof(struct irecv_client));
-				client->interface = 0;
-				client->handle = usb_handle;
-				client->mode = usb_descriptor.idProduct;
-
-				error = irecv_set_configuration(client, 1);
-				if (error != IRECV_E_SUCCESS) {
-					return error;
-				}
-
-				error = irecv_set_interface(client, 1, 1);
-				if (error != IRECV_E_SUCCESS) {
-					return error;
-				}
-
-				*pclient = client;
-				return IRECV_E_SUCCESS;
-			}
-		}
-	}
-
-	return IRECV_E_UNABLE_TO_CONNECT;
-}
-
-irecv_error_t irecv_set_configuration(irecv_client_t client, int configuration) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	debug("Setting to configuration %d", configuration);
-
-	int current = 0;
-	libusb_get_configuration(client->handle, &current);
-	if (current != configuration) {
-		if (libusb_set_configuration(client->handle, configuration) < 0) {
-			return IRECV_E_USB_CONFIGURATION;
-		}
-	}
-
-	client->config = configuration;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_set_interface(irecv_client_t client, int interface, int alt_interface) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	if (client->interface == interface) {
-		return IRECV_E_SUCCESS;
-	}
-
-	debug("Setting to interface %d:%d", interface, alt_interface);
-	if (libusb_claim_interface(client->handle, interface) < 0) {
-		return IRECV_E_USB_INTERFACE;
-	}
-
-	if (libusb_set_interface_alt_setting(client->handle, interface, alt_interface) < 0) {
-		return IRECV_E_USB_INTERFACE;
-	}
-
-	client->interface = interface;
-	client->alt_interface = alt_interface;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_reset(irecv_client_t client) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	libusb_reset_device(client->handle);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_event_subscribe(irecv_client_t client, irecv_event_type type, irecv_event_cb_t callback, void* user_data) {
-	switch(type) {
-	case IRECV_RECEIVED:
-		client->received_callback = callback;
-		break;
-
-	case IRECV_PROGRESS:
-		client->progress_callback = callback;
-
-	case IRECV_CONNECTED:
-		client->connected_callback = callback;
-
-	case IRECV_PRECOMMAND:
-		client->precommand_callback = callback;
-		break;
-
-	case IRECV_POSTCOMMAND:
-		client->postcommand_callback = callback;
-		break;
-
-	case IRECV_DISCONNECTED:
-		client->disconnected_callback = callback;
-
-	default:
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_event_unsubscribe(irecv_client_t client, irecv_event_type type) {
-	switch(type) {
-	case IRECV_RECEIVED:
-		client->received_callback = NULL;
-		break;
-
-	case IRECV_PROGRESS:
-		client->progress_callback = NULL;
-
-	case IRECV_CONNECTED:
-		client->connected_callback = NULL;
-
-	case IRECV_PRECOMMAND:
-		client->precommand_callback = NULL;
-		break;
-
-	case IRECV_POSTCOMMAND:
-		client->postcommand_callback = NULL;
-		break;
-
-	case IRECV_DISCONNECTED:
-		client->disconnected_callback = NULL;
-
-	default:
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_close(irecv_client_t client) {
-	if (client != NULL) {
-		if(client->disconnected_callback != NULL) {
-			irecv_event_t event;
-			event.size = 0;
-			event.data = NULL;
-			event.progress = 0;
-			event.type = IRECV_DISCONNECTED;
-			client->disconnected_callback(client, &event);
-		}
-
-		if (client->handle != NULL) {
-			libusb_release_interface(client->handle, client->interface);
-			libusb_close(client->handle);
-			client->handle = NULL;
-		}
-
-		if (libirecovery_context != NULL) {
-			libusb_exit(libirecovery_context);
-			libirecovery_context = NULL;
-		}
-
-		free(client);
-		client = NULL;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-void irecv_set_debug_level(int level) {
-	libirecovery_debug = level;
-	if(libirecovery_context) {
-		libusb_set_debug(libirecovery_context, libirecovery_debug);
-	}
-}
-
-irecv_error_t irecv_send_command(irecv_client_t client, unsigned char* command) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	unsigned int length = strlen(command);
-	if (length >= 0x100) {
-		length = 0xFF;
-	}
-
-	irecv_event_t event;
-	if(client->precommand_callback != NULL) {
-		event.size = length;
-		event.data = command;
-		event.type = IRECV_PRECOMMAND;
-		if(client->precommand_callback(client, &event)) {
-			return IRECV_E_SUCCESS;
-		}
-	}
-
-	if (length > 0) {
-		libusb_control_transfer(client->handle, 0x40, 0, 0, 0, command, length + 1, 100);
-	}
-
-	if(client->postcommand_callback != NULL) {
-		event.size = length;
-		event.data = command;
-		event.type = IRECV_POSTCOMMAND;
-		if(client->postcommand_callback(client, &event)) {
-			return IRECV_E_SUCCESS;
-		}
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_file(irecv_client_t client, const char* filename) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	FILE* file = fopen(filename, "rb");
-	if (file == NULL) {
-		return IRECV_E_FILE_NOT_FOUND;
-	}
-
-	fseek(file, 0, SEEK_END);
-	int length = ftell(file);
-	fseek(file, 0, SEEK_SET);
-
-	unsigned char* buffer = (unsigned char*) malloc(length);
-	if (buffer == NULL) {
-		fclose(file);
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	int bytes = fread(buffer, 1, length, file);
-	fclose(file);
-
-	if (bytes != length) {
-		free(buffer);
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	irecv_error_t error = irecv_send_buffer(client, buffer, length);
-	free(buffer);
-	return error;
-}
-
-irecv_error_t irecv_get_status(irecv_client_t client, unsigned int* status) {
-	if (client == NULL || client->handle == NULL) {
-		*status = 0;
-		return IRECV_E_NO_DEVICE;
-	}
-
-	unsigned char buffer[6];
-	memset(buffer, '\0', 6);
-	if (libusb_control_transfer(client->handle, 0xA1, 3, 0, 0, buffer, 6, 1000) != 6) {
-		*status = 0;
-		return IRECV_E_USB_STATUS;
-	}
-
-	debug("status: %d\n", (unsigned int) buffer[4]);
-	*status = (unsigned int) buffer[4];
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_buffer(irecv_client_t client, unsigned char* buffer, unsigned int length) {
-	irecv_error_t error = 0;
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	int last = length % 0x800;
-	int packets = length / 0x800;
-	if (last != 0) {
-		packets++;
-	}
-
-	int i = 0;
-	double progress = 0;
-	unsigned int count = 0;
-	unsigned int status = 0;
-	for (i = 0; i < packets; i++) {
-		int size = i + 1 < packets ? 0x800 : last;
-		int bytes = libusb_control_transfer(client->handle, 0x21, 1, 0, 0, &buffer[i * 0x800], size, 1000);
-		if (bytes != size) {
-			return IRECV_E_USB_UPLOAD;
-		}
-
-		error = irecv_get_status(client, &status);
-		if (error != IRECV_E_SUCCESS) {
-			return error;
-		}
-
-		if (status != 5) {
-			return IRECV_E_USB_UPLOAD;
-		}
-
-		count += size;
-		if(client->progress_callback != NULL) {
-			irecv_event_t event;
-			event.progress = ((double) count/ (double) length) * 100.0;
-			event.type = IRECV_PROGRESS;
-			event.data = "Uploading";
-			event.size = count;
-			client->progress_callback(client, &event);
-		} else {
-			debug("Sent: %d bytes - %d of %d\n", bytes, count, length);
-		}
-	}
-
-	libusb_control_transfer(client->handle, 0x21, 1, 0, 0, buffer, 0, 1000);
-	for (i = 0; i < 3; i++) {
-		error = irecv_get_status(client, &status);
-		if (error != IRECV_E_SUCCESS) {
-			return error;
-		}
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_receive(irecv_client_t client) {
-	unsigned char buffer[BUFFER_SIZE];
-	memset(buffer, '\0', BUFFER_SIZE);
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	int bytes = 0;
-	while (libusb_bulk_transfer(client->handle, 0x81, buffer, BUFFER_SIZE, &bytes, 100) == 0) {
-		if (bytes > 0) {
-			if (client->received_callback != NULL) {
-				irecv_event_t event;
-				event.size = bytes;
-				event.data = buffer;
-				event.type = IRECV_RECEIVED;
-				if (client->received_callback(client, &event) != 0) {
-					return IRECV_E_SUCCESS;
-				}
-			}
-		} else break;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_getenv(irecv_client_t client, const char* variable, char** value) {
-	char command[256];
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	*value = NULL;
-
-	if(variable == NULL) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	memset(command, '\0', sizeof(command));
-	snprintf(command, sizeof(command)-1, "getenv %s", variable);
-	irecv_error_t error = irecv_send_command(client, command);
-	if(error != IRECV_E_SUCCESS) {
-		return error;
-	}
-
-	unsigned char* response = (unsigned char*) malloc(256);
-	if (response == NULL) {
-		return IRECV_E_OUT_OF_MEMORY;
-	}
-
-	memset(response, '\0', 256);
-	int ret = libusb_control_transfer(client->handle, 0xC0, 0, 0, 0, response, 255, 500);
-	if (ret < 0) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	*value = response;
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_cpid(irecv_client_t client, unsigned int* cpid) {
-	char info[256];
-	memset(info, '\0', 256);
-
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	libusb_get_string_descriptor_ascii(client->handle, 3, info, 255);
-
-	unsigned char* cpid_string = strstr(info, "CPID:");
-	if (cpid_string == NULL) {
-		*cpid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(cpid_string, "CPID:%d", cpid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_bdid(irecv_client_t client, unsigned int* bdid) {
-	char info[256];
-	memset(info, '\0', 256);
-
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	libusb_get_string_descriptor_ascii(client->handle, 3, info, 255);
-
-	unsigned char* bdid_string = strstr(info, "BDID:");
-	if (bdid_string == NULL) {
-		*bdid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(bdid_string, "BDID:%d", bdid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_get_ecid(irecv_client_t client, unsigned long long* ecid) {
-	char info[256];
-	memset(info, '\0', 256);
-
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	libusb_get_string_descriptor_ascii(client->handle, 3, info, 255);
-
-	unsigned char* ecid_string = strstr(info, "ECID:");
-	if (ecid_string == NULL) {
-		*ecid = 0;
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-	sscanf(ecid_string, "ECID:%qX", ecid);
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_send_exploit(irecv_client_t client) {
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	libusb_control_transfer(client->handle, 0x21, 2, 0, 0, NULL, 0, 100);
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_execute_script(irecv_client_t client, const char* filename) {
-	irecv_error_t error = IRECV_E_SUCCESS;
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	int file_size = 0;
-	char* file_data = NULL;
-	if(irecv_read_file(filename, &file_data, &file_size) < 0) {
-		return IRECV_E_FILE_NOT_FOUND;
-	}
-
-	char* line = strtok(file_data, "\n");
-	while(line != NULL) {
-		if(line[0] != '#') {
-			error = irecv_send_command(client, line);
-			if(error != IRECV_E_SUCCESS) {
-				return error;
-			}
-
-			error = irecv_receive(client);
-			if(error != IRECV_E_SUCCESS) {
-				return error;
-			}
-		}
-		line = strtok(NULL, "\n");
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-irecv_error_t irecv_setenv(irecv_client_t client, const char* variable, const char* value) {
-	char command[256];
-	if (client == NULL || client->handle == NULL) {
-		return IRECV_E_NO_DEVICE;
-	}
-
-	if(variable == NULL || value == NULL) {
-		return IRECV_E_UNKNOWN_ERROR;
-	}
-
-	memset(command, '\0', sizeof(command));
-	snprintf(command, sizeof(command)-1, "setenv %s %s", variable, value);
-	irecv_error_t error = irecv_send_command(client, command);
-	if(error != IRECV_E_SUCCESS) {
-		return error;
-	}
-
-	return IRECV_E_SUCCESS;
-}
-
-const char* irecv_strerror(irecv_error_t error) {
-	switch (error) {
-	case IRECV_E_SUCCESS:
-		return "Command completed successfully";
-
-	case IRECV_E_NO_DEVICE:
-		return "Unable to find device";
-
-	case IRECV_E_OUT_OF_MEMORY:
-		return "Out of memory";
-
-	case IRECV_E_UNABLE_TO_CONNECT:
-		return "Unable to connect to device";
-
-	case IRECV_E_INVALID_INPUT:
-		return "Invalid input";
-
-	case IRECV_E_FILE_NOT_FOUND:
-		return "File not found";
-
-	case IRECV_E_USB_UPLOAD:
-		return "Unable to upload data to device";
-
-	case IRECV_E_USB_STATUS:
-		return "Unable to get device status";
-
-	case IRECV_E_USB_INTERFACE:
-		return "Unable to set device interface";
-
-	case IRECV_E_USB_CONFIGURATION:
-		return "Unable to set device configuration";
-
-	default:
-		return "Unknown error";
-	}
-
-	return NULL;
-}
-
-int irecv_write_file(const char* filename, const void* data, size_t size) {
-	size_t bytes = 0;
-	FILE* file = NULL;
-
-	debug("Writing data to %s\n", filename);
-	file = fopen(filename, "wb");
-	if (file == NULL) {
-		error("read_file: Unable to open file %s\n", filename);
-		return -1;
-	}
-
-	bytes = fwrite(data, 1, size, file);
-	fclose(file);
-
-	if (bytes != size) {
-		error("ERROR: Unable to write entire file: %s: %d of %d\n", filename, bytes, size);
-		return -1;
-	}
-
-	return size;
-}
-
-int irecv_read_file(const char* filename, char** data, uint32_t* size) {
-	size_t bytes = 0;
-	size_t length = 0;
-	FILE* file = NULL;
-	char* buffer = NULL;
-	debug("Reading data from %s\n", filename);
-
-	*size = 0;
-	*data = NULL;
-
-	file = fopen(filename, "rb");
-	if (file == NULL) {
-		error("read_file: File %s not found\n", filename);
-		return -1;
-	}
-
-	fseek(file, 0, SEEK_END);
-	length = ftell(file);
-	rewind(file);
-
-	buffer = (char*) malloc(length);
-	if(buffer == NULL) {
-		error("ERROR: Out of memory\n");
-		fclose(file);
-		return -1;
-	}
-	bytes = fread(buffer, 1, length, file);
-	fclose(file);
-
-	if(bytes != length) {
-		error("ERROR: Unable to read entire file\n");
-		free(buffer);
-		return -1;
-	}
-
-	*size = length;
-	*data = buffer;
-	return 0;
-}