Even more major cleanups and refactoring, this branch is still broken but starting to mature really well

1 files changed, 297 insertions, 532 deletions

diff --git a/src/idevicerestore.c b/src/idevicerestore.c
index 4494f04..d2f6039 100644
--- a/src/idevicerestore.c
+++ b/src/idevicerestore.c
@@ -46,21 +46,246 @@ int idevicerestore_verbose = 0;
 idevicerestore_mode_t idevicerestore_mode = UNKNOWN_MODE;
 idevicerestore_device_t idevicerestore_device = UNKNOWN_DEVICE;
 
-void usage(int argc, char* argv[]);
-int get_device(const char* uuid);
 int check_mode(const char* uuid);
+int check_device(const char* uuid);
+void usage(int argc, char* argv[]);
 int get_ecid(const char* uuid, uint64_t* ecid);
 int get_bdid(const char* uuid, uint32_t* bdid);
 int get_cpid(const char* uuid, uint32_t* cpid);
-int write_file(const char* filename, char* data, int size);
+void device_callback(const idevice_event_t* event, void* user_data);
 int extract_buildmanifest(const char* ipsw, plist_t* buildmanifest);
 plist_t get_build_identity(plist_t buildmanifest, uint32_t identity);
+int write_file(const char* filename, const char* data, uint32_t size);
+int get_shsh_blobs(uint64_t ecid, plist_t build_identity, plist_t* tss);
 int extract_filesystem(const char* ipsw, plist_t buildmanifest, char** filesystem);
-int get_tss_data_by_name(plist_t tss, const char* entry, char** path, char** blob);
-int get_tss_data_by_path(plist_t tss, const char* path, char** name, char** blob);
-void device_callback(const idevice_event_t* event, void *user_data);
-int get_signed_component_by_name(char* ipsw, plist_t tss, char* component, char** pdata, int* psize);
-int get_signed_component_by_path(char* ipsw, plist_t tss, char* path, char** pdata, int* psize);
+int get_signed_component_by_name(char* ipsw, plist_t tss, const char* component, char** data, uint32_t* size);
+int get_signed_component(char* ipsw, plist_t tss, const char* path, char** data, uint32_t* size);
+
+void usage(int argc, char* argv[]) {
+	char *name = strrchr(argv[0], '/');
+	printf("Usage: %s [OPTIONS] FILE\n", (name ? name + 1 : argv[0]));
+	printf("Restore/upgrade IPSW firmware FILE to an iPhone/iPod Touch.\n");
+	printf("  -d, \t\tenable communication debugging\n");
+	printf("  -u, \t\ttarget specific device by its 40-digit device UUID\n");
+	printf("  -h, \t\tprints usage information\n");
+	printf("  -c, \t\trestore with a custom firmware\n");
+	printf("  -v, \t\tenable verbose output\n");
+	printf("\n");
+}
+
+int main(int argc, char* argv[]) {
+	int opt = 0;
+	char* ipsw = NULL;
+	char* uuid = NULL;
+	uint64_t ecid = 0;
+	while ((opt = getopt(argc, argv, "vdhceu:")) > 0) {
+		switch (opt) {
+		case 'h':
+			usage(argc, argv);
+			break;
+
+		case 'd':
+			idevicerestore_debug = 1;
+			break;
+
+		case 'e':
+			idevicerestore_erase = 1;
+			break;
+
+		case 'c':
+			idevicerestore_custom = 1;
+			break;
+
+		case 'v':
+			idevicerestore_verbose = 1;
+			break;
+
+		case 'u':
+			uuid = optarg;
+			break;
+
+		default:
+			usage(argc, argv);
+			return -1;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 1)
+		ipsw = argv[0];
+
+	if (ipsw == NULL) {
+		usage(argc, argv);
+		error("ERROR: Please supply an IPSW\n");
+		return -1;
+	}
+
+	// check which mode the device is currently in so we know where to start
+	idevicerestore_mode = check_mode(uuid);
+	if (idevicerestore_mode < 0) {
+		error("ERROR: Unable to discover current device state\n");
+		return -1;
+	}
+
+	// discover the device type
+	idevicerestore_device = check_device(uuid);
+	if (idevicerestore_device < 0) {
+		error("ERROR: Unable to discover device type\n");
+		return -1;
+	}
+
+	// extract buildmanifest
+	plist_t buildmanifest = NULL;
+	info("Extracting BuildManifest from IPSW\n");
+	if (extract_buildmanifest(ipsw, &buildmanifest) < 0) {
+		error("ERROR: Unable to extract BuildManifest from %s\n", ipsw);
+		return -1;
+	}
+
+	// choose whether this is an upgrade or a restore (default to upgrade)
+	plist_t build_identity = NULL;
+	if (idevicerestore_erase) {
+		build_identity = get_build_identity(buildmanifest, 0);
+		if (build_identity == NULL) {
+			error("ERROR: Unable to find build any identities\n");
+			plist_free(buildmanifest);
+			return -1;
+		}
+
+	} else {
+		build_identity = get_build_identity(buildmanifest, 1);
+		if (build_identity == NULL) {
+			build_identity = get_build_identity(buildmanifest, 0);
+			if (build_identity == NULL) {
+				error("ERROR: Unable to find build any identities\n");
+				plist_free(buildmanifest);
+				return -1;
+			}
+			info("No upgrade ramdisk found, default to full restore\n");
+		}
+	}
+
+	// devices are listed in order from oldest to newest
+	// devices that come after iPod2g require personalized firmwares
+	plist_t tss_request = NULL;
+	plist_t tss = NULL;
+	if (idevicerestore_device > IPOD2G_DEVICE) {
+		info("Creating TSS request\n");
+		// fetch the device's ECID for the TSS request
+		if (get_ecid(uuid, &ecid) < 0 || ecid == 0) {
+			error("ERROR: Unable to find device ECID\n");
+			return -1;
+		}
+		info("Found ECID %llu\n", ecid);
+
+		// fetch the SHSH blobs for this build identity
+		if (get_shsh_blobs(ecid, build_identity, &tss) < 0) {
+			// this might fail if the TSS server doesn't have the saved blobs for the
+			// update identity, so go ahead and try again with the restore identity
+			if (idevicerestore_erase != 1) {
+				info("Unable to fetch SHSH blobs for upgrade, retrying with full restore\n");
+				build_identity = get_build_identity(buildmanifest, 0);
+				if (build_identity == NULL) {
+					error("ERROR: Unable to find restore identity\n");
+					plist_free(buildmanifest);
+					return -1;
+				}
+
+				if (get_shsh_blobs(ecid, build_identity, &tss) < 0) {
+					// if this fails then no SHSH blobs have been saved for this firmware
+					error("ERROR: Unable to fetch SHSH blobs for this firmware\n");
+					plist_free(buildmanifest);
+					return -1;
+				}
+
+			} else {
+				error("ERROR: Unable to fetch SHSH blobs for this firmware\n");
+				plist_free(buildmanifest);
+				return -1;
+			}
+		}
+	}
+
+	// Extract filesystem from IPSW and return its name
+	char* filesystem = NULL;
+	if (extract_filesystem(ipsw, build_identity, &filesystem) < 0) {
+		error("ERROR: Unable to extract filesystem from IPSW\n");
+		if (tss)
+			plist_free(tss);
+		plist_free(buildmanifest);
+		return -1;
+	}
+
+	// if the device is in normal mode, place device into recovery mode
+	if (idevicerestore_mode == NORMAL_MODE) {
+		info("Entering recovery mode...\n");
+		if (normal_enter_recovery(uuid) < 0) {
+			error("ERROR: Unable to place device into recovery mode\n");
+			if (tss)
+				plist_free(tss);
+			plist_free(buildmanifest);
+			return -1;
+		}
+	}
+
+	// if the device is in DFU mode, place device into recovery mode
+	if (idevicerestore_mode == DFU_MODE) {
+		if (dfu_enter_recovery(ipsw, tss) < 0) {
+			error("ERROR: Unable to place device into recovery mode\n");
+			plist_free(buildmanifest);
+			if (tss)
+				plist_free(tss);
+			return -1;
+		}
+	}
+
+	// if the device is in recovery mode, place device into restore mode
+	if (idevicerestore_mode == RECOVERY_MODE) {
+		if (recovery_enter_restore(uuid, ipsw, tss) < 0) {
+			error("ERROR: Unable to place device into restore mode\n");
+			plist_free(buildmanifest);
+			if (tss)
+				plist_free(tss);
+			return -1;
+		}
+	}
+
+	// device is finally in restore mode, let's do this
+	if (idevicerestore_mode == RESTORE_MODE) {
+		info("Restoring device... \n");
+		if (restore_device(uuid, ipsw, tss, filesystem) < 0) {
+			error("ERROR: Unable to restore device\n");
+			return -1;
+		}
+	}
+
+	// device has finished restoring, lets see if we need to activate
+	if (idevicerestore_mode == NORMAL_MODE) {
+		info("Checking activation status\n");
+		int activation = activate_check_status(uuid);
+		if (activation < 0) {
+			error("ERROR: Unable to check activation status\n");
+			return -1;
+		}
+
+		if (activation == 0) {
+			info("Activating device... \n");
+			if (activate_device(uuid) < 0) {
+				error("ERROR: Unable to activate device\n");
+				return -1;
+			}
+		}
+	}
+
+	info("Cleaning up...\n");
+	if (filesystem)
+		unlink(filesystem);
+
+	info("DONE\n");
+	return 0;
+}
 
 int check_mode(const char* uuid) {
 	idevicerestore_mode_t mode = UNKNOWN_MODE;
@@ -87,14 +312,14 @@ int check_mode(const char* uuid) {
 	return mode;
 }
 
-int get_device(const char* uuid) {
+int check_device(const char* uuid) {
 	uint32_t bdid = 0;
 	uint32_t cpid = 0;
 	idevicerestore_device_t device = UNKNOWN_DEVICE;
 
 	switch (idevicerestore_mode) {
 	case NORMAL_MODE:
-		device = normal_get_device(uuid);
+		device = normal_check_device(uuid);
 		if (device < 0) {
 			device = UNKNOWN_DEVICE;
 		}
@@ -175,6 +400,7 @@ int get_bdid(const char* uuid, uint32_t* bdid) {
 		}
 		break;
 
+	case DFU_MODE:
 	case RECOVERY_MODE:
 		if (recovery_get_bdid(bdid) < 0) {
 			*bdid = -1;
@@ -182,13 +408,6 @@ int get_bdid(const char* uuid, uint32_t* bdid) {
 		}
 		break;
 
-	case DFU_MODE:
-		if (dfu_get_bdid(bdid) < 0) {
-			*bdid = -1;
-			return -1;
-		}
-		break;
-
 	default:
 		error("ERROR: Device is in an invalid state\n");
 		return -1;
@@ -206,6 +425,7 @@ int get_cpid(const char* uuid, uint32_t* cpid) {
 		}
 		break;
 
+	case DFU_MODE:
 	case RECOVERY_MODE:
 		if (recovery_get_cpid(cpid) < 0) {
 			*cpid = 0;
@@ -213,13 +433,6 @@ int get_cpid(const char* uuid, uint32_t* cpid) {
 		}
 		break;
 
-	case DFU_MODE:
-		if (dfu_get_cpid(cpid) < 0) {
-			*cpid = 0;
-			return -1;
-		}
-		break;
-
 	default:
 		error("ERROR: Device is in an invalid state\n");
 		return -1;
@@ -237,6 +450,7 @@ int get_ecid(const char* uuid, uint64_t* ecid) {
 		}
 		break;
 
+	case DFU_MODE:
 	case RECOVERY_MODE:
 		if (recovery_get_ecid(ecid) < 0) {
 			*ecid = 0;
@@ -244,13 +458,6 @@ int get_ecid(const char* uuid, uint64_t* ecid) {
 		}
 		break;
 
-	case DFU_MODE:
-		if (dfu_get_ecid(ecid) < 0) {
-			*ecid = 0;
-			return -1;
-		}
-		break;
-
 	default:
 		error("ERROR: Device is in an invalid state\n");
 		return -1;
@@ -292,7 +499,7 @@ plist_t get_build_identity(plist_t buildmanifest, uint32_t identity) {
 	}
 
 	// check and make sure this identity exists in buildmanifest
-	if(identity >= plist_array_get_size(build_identities_array)) {
+	if (identity >= plist_array_get_size(build_identities_array)) {
 		return NULL;
 	}
 
@@ -302,18 +509,35 @@ plist_t get_build_identity(plist_t buildmanifest, uint32_t identity) {
 		return NULL;
 	}
 
-	return build_identity;
+	return plist_copy(build_identity);
+}
+
+int get_shsh_blobs(uint64_t ecid, plist_t build_identity, plist_t* tss) {
+	plist_t request = NULL;
+	plist_t response = NULL;
+	*tss = NULL;
+
+	request = tss_create_request(build_identity, ecid);
+	if (request == NULL) {
+		error("ERROR: Unable to create TSS request\n");
+		return -1;
+	}
+
+	info("Sending TSS request\n");
+	response = tss_send_request(request);
+	if (response == NULL) {
+		plist_free(request);
+		return -1;
+	}
+
+	plist_free(request);
+	*tss = response;
+	return 0;
 }
 
 int extract_filesystem(const char* ipsw, plist_t build_identity, char** filesystem) {
 	char* filename = NULL;
 
-	int sz = 0;
-	char* xml = NULL;
-	plist_to_xml(build_identity, &xml, &sz);
-	debug("%s", xml);
-	free(xml);
-
 	plist_t manifest_node = plist_dict_get_item(build_identity, "Manifest");
 	if (!manifest_node || plist_get_node_type(manifest_node) != PLIST_DICT) {
 		error("ERROR: Unable to find manifest node\n");
@@ -349,538 +573,79 @@ int extract_filesystem(const char* ipsw, plist_t build_identity, char** filesyst
 	return 0;
 }
 
-int main(int argc, char* argv[]) {
-	int opt = 0;
-	char* ipsw = NULL;
-	char* uuid = NULL;
-	uint64_t ecid = 0;
-	while ((opt = getopt(argc, argv, "vdhceu:")) > 0) {
-		switch (opt) {
-		case 'h':
-			usage(argc, argv);
-			break;
-
-		case 'd':
-			idevicerestore_debug = 1;
-			break;
-
-		case 'e':
-			idevicerestore_erase = 1;
-			break;
-
-		case 'c':
-			idevicerestore_custom = 1;
-			break;
-
-		case 'v':
-			idevicerestore_verbose = 1;
-			break;
-
-		case 'u':
-			uuid = optarg;
-			break;
-
-		default:
-			usage(argc, argv);
-			return -1;
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc == 1)
-		ipsw = argv[0];
-
-	if (ipsw == NULL) {
-		usage(argc, argv);
-		error("ERROR: Please supply an IPSW\n");
-		return -1;
-	}
-
-	// check which mode the device is currently in so we know where to start
-	idevicerestore_mode = check_mode(uuid);
-	if (idevicerestore_mode < 0) {
-		error("ERROR: Unable to discover device current mode\n");
-		return -1;
-	}
-
-	// discover the device type
-	idevicerestore_device = get_device(uuid);
-	if (idevicerestore_device < 0) {
-		error("ERROR: Unable to discover device type\n");
-		return -1;
-	}
-
-	// extract buildmanifest
-	plist_t buildmanifest = NULL;
-	info("Extracting BuildManifest from IPSW\n");
-	if (extract_buildmanifest(ipsw, &buildmanifest) < 0) {
-		error("ERROR: Unable to extract BuildManifest from %s\n", ipsw);
-		return -1;
-	}
-
-	// choose whether this is an upgrade or a restore (default to upgrade)
-	plist_t build_identity = NULL;
-	if(idevicerestore_erase) {
-		build_identity = get_build_identity(buildmanifest, 0);
-		if(build_identity == NULL) {
-			error("ERROR: Unable to find build any identities\n");
-			plist_free(buildmanifest);
-			return -1;
-		}
-
-	} else {
-		build_identity = get_build_identity(buildmanifest, 1);
-		if(build_identity == NULL) {
-			build_identity = get_build_identity(buildmanifest, 0);
-			if(build_identity == NULL) {
-				error("ERROR: Unable to find build any identities\n");
-				plist_free(buildmanifest);
-				return -1;
-			}
-			info("No upgrade ramdisk found, default to full restore\n");
-		}
-	}
-
-	// devices are listed in order from oldest to newest
-	// devices that come after iPod2g require personalized firmwares
-	plist_t tss_request = NULL;
-	plist_t tss = NULL;
-	if(idevicerestore_device > IPOD2G_DEVICE) {
-
-		info("Creating TSS request\n");
-		// fetch the device's ECID for the TSS request
-		if (get_ecid(uuid, &ecid) < 0 || ecid == 0) {
-			error("ERROR: Unable to find device ECID\n");
-			return -1;
-		}
-		info("Found ECID %llu\n", ecid);
-
-		tss_request = tss_create_request(build_identity, ecid);
-		if (tss_request == NULL) {
-			error("ERROR: Unable to create TSS request\n");
-			plist_free(buildmanifest);
-			return -1;
-		}
-
-		info("Sending TSS request\n");
-		tss = tss_send_request(tss_request);
-		if (tss == NULL) {
-			error("ERROR: Unable to get response from TSS server\n");
-			plist_free(tss_request);
-			return -1;
-		}
-		info("Got TSS response\n");
-		plist_free(tss_request);
-	}
-
-	// Extract filesystem from IPSW and return its name
-	char* filesystem = NULL;
-	if(extract_filesystem(ipsw, build_identity, &filesystem) < 0) {
-		error("ERROR: Unable to extract filesystem from IPSW\n");
-		if(tss) plist_free(tss);
-		plist_free(buildmanifest);
-		return -1;
-	}
-
-	// place device into recovery mode if required
-	if (idevicerestore_mode == NORMAL_MODE) {
-		info("Entering recovery mode...\n");
-		if (normal_enter_recovery(uuid) < 0) {
-			error("ERROR: Unable to place device into recovery mode\n");
-			if(tss) plist_free(tss);
-			plist_free(buildmanifest);
-			return -1;
-		}
-	}
-
-	// place device into restore mode if required
-	if (idevicerestore_mode == RECOVERY_MODE) {
-		if (recovery_enter_restore(ipsw, tss) < 0) {
-			error("ERROR: Unable to place device into restore mode\n");
-			if(tss) plist_free(tss);
-			plist_free(buildmanifest);
-			return -1;
-		}
-	}
-
-	idevice_event_subscribe(&device_callback, NULL);
-	info("Waiting for device to enter restore mode\n");
-	// block program until device has entered restore mode
-	while (idevicerestore_mode != RESTORE_MODE) {
-		sleep(1);
-	}
-
-	idevice_t device = NULL;
-	idevice_error_t device_error = idevice_new(&device, uuid);
-	if (device_error != IDEVICE_E_SUCCESS) {
-		error("ERROR: Unable to open device\n");
-		plist_free(tss);
-		return -1;
-	}
-
-	restored_client_t restore = NULL;
-	restored_error_t restore_error = restored_client_new(device, &restore, "idevicerestore");
-	if (restore_error != RESTORE_E_SUCCESS) {
-		error("ERROR: Unable to start restored client\n");
-		plist_free(tss);
-		idevice_free(device);
-		return -1;
-	}
-
-	char* type = NULL;
-	uint64_t version = 0;
-	if (restored_query_type(restore, &type, &version) != RESTORE_E_SUCCESS) {
-		error("ERROR: Device is not in restore mode. QueryType returned \"%s\"\n", type);
-		plist_free(tss);
-		restored_client_free(restore);
-		idevice_free(device);
-		return -1;
-	}
-	info("Device has successfully entered restore mode\n");
-
-	/* start restore process */
-	char* kernelcache = NULL;
-	info("Restore protocol version is %llu.\n", version);
-	restore_error = restored_start_restore(restore);
-	if (restore_error == RESTORE_E_SUCCESS) {
-		while (!idevicerestore_quit) {
-			plist_t message = NULL;
-			restore_error = restored_receive(restore, &message);
-			plist_t msgtype_node = plist_dict_get_item(message, "MsgType");
-			if (msgtype_node && PLIST_STRING == plist_get_node_type(msgtype_node)) {
-				char *msgtype = NULL;
-				plist_get_string_val(msgtype_node, &msgtype);
-				if (!strcmp(msgtype, "ProgressMsg")) {
-					restore_error = restore_handle_progress_msg(restore, message);
-
-				} else if (!strcmp(msgtype, "DataRequestMsg")) {
-					// device is requesting data to be sent
-					plist_t datatype_node = plist_dict_get_item(message, "DataType");
-					if (datatype_node && PLIST_STRING == plist_get_node_type(datatype_node)) {
-						char *datatype = NULL;
-						plist_get_string_val(datatype_node, &datatype);
-						if (!strcmp(datatype, "SystemImageData")) {
-							restore_send_filesystem(device, restore, filesystem);
-
-						} else if (!strcmp(datatype, "KernelCache")) {
-							int kernelcache_size = 0;
-							char* kernelcache_data = NULL;
-							if (get_signed_component_by_name(ipsw, tss, "KernelCache", &kernelcache_data, &kernelcache_size) < 0) {
-								error("ERROR: Unable to get kernelcache file\n");
-								return -1;
-							}
-							restore_send_kernelcache(restore, kernelcache_data, kernelcache_size);
-							free(kernelcache_data);
-
-						} else if (!strcmp(datatype, "NORData")) {
-							restore_send_nor(restore, ipsw, tss);
-
-						} else {
-							// Unknown DataType!!
-							error("Unknown DataType\n");
-							return -1;
-						}
-					}
-
-				} else if (!strcmp(msgtype, "StatusMsg")) {
-					restore_error = restore_handle_status_msg(restore, message);
-
-				} else {
-					info("Received unknown message type: %s\n", msgtype);
-				}
-			}
-
-			if (RESTORE_E_SUCCESS != restore_error) {
-				error("Invalid return status %d\n", restore_error);
-				//idevicerestore_quit = 1;
-			}
-
-			plist_free(message);
-		}
-	} else {
-		error("ERROR: Could not start restore. %d\n", restore_error);
-	}
-
-	restored_client_free(restore);
-	plist_free(tss);
-	idevice_free(device);
-	unlink(filesystem);
-	return 0;
-}
-
-void device_callback(const idevice_event_t* event, void *user_data) {
-	if (event->event == IDEVICE_DEVICE_ADD) {
-		idevicerestore_mode = RESTORE_MODE;
-	} else if (event->event == IDEVICE_DEVICE_REMOVE) {
-		idevicerestore_quit = 1;
-	}
-}
-
-void usage(int argc, char* argv[]) {
-	char *name = strrchr(argv[0], '/');
-	printf("Usage: %s [OPTIONS] FILE\n", (name ? name + 1 : argv[0]));
-	printf("Restore/upgrade IPSW firmware FILE to an iPhone/iPod Touch.\n");
-	printf("  -d, \t\tenable communication debugging\n");
-	printf("  -u, \t\ttarget specific device by its 40-digit device UUID\n");
-	printf("  -h, \t\tprints usage information\n");
-	printf("  -c, \t\trestore with a custom firmware\n");
-	printf("  -v, \t\tenable verbose output\n");
-	printf("\n");
-}
-
-int write_file(const char* filename, char* data, int size) {
-	debug("Writing data to %s\n", filename);
-	FILE* file = fopen(filename, "wb");
-	if (file == NULL) {
-		error("read_file: Unable to open file %s\n", filename);
-		return -1;
-	}
-
-	int bytes = fwrite(data, 1, size, file);
-	fclose(file);
-
-	if (bytes != size) {
-		error("ERROR: Unable to write entire file: %s: %d %d\n", filename, bytes, size);
-		return -1;
-	}
-
-	return size;
-}
-
-int get_tss_data_by_path(plist_t tss, const char* path, char** pname, char** pblob) {
-	*pname = NULL;
-	*pblob = NULL;
-
-	char* key = NULL;
-	plist_t tss_entry = NULL;
-	plist_dict_iter iter = NULL;
-	plist_dict_new_iter(tss, &iter);
-	while (1) {
-		plist_dict_next_item(tss, iter, &key, &tss_entry);
-		if (key == NULL)
-			break;
-
-		if (!tss_entry || plist_get_node_type(tss_entry) != PLIST_DICT) {
-			continue;
-		}
-
-		char* entry_path = NULL;
-		plist_t entry_path_node = plist_dict_get_item(tss_entry, "Path");
-		if (!entry_path_node || plist_get_node_type(entry_path_node) != PLIST_STRING) {
-			error("ERROR: Unable to find TSS path node in entry %s\n", key);
-			return -1;
-		}
-		plist_get_string_val(entry_path_node, &entry_path);
-		if (strcmp(path, entry_path) == 0) {
-			char* blob = NULL;
-			uint64_t blob_size = 0;
-			plist_t blob_node = plist_dict_get_item(tss_entry, "Blob");
-			if (!blob_node || plist_get_node_type(blob_node) != PLIST_DATA) {
-				error("ERROR: Unable to find TSS blob node in entry %s\n", key);
-				return -1;
-			}
-			plist_get_data_val(blob_node, &blob, &blob_size);
-			*pname = key;
-			*pblob = blob;
-			return 0;
-		}
-
-		free(key);
-	}
-	plist_free(tss_entry);
-
-	return -1;
-}
-
-int get_tss_data_by_name(plist_t tss, const char* entry, char** ppath, char** pblob) {
-	*ppath = NULL;
-	*pblob = NULL;
-
-	plist_t node = plist_dict_get_item(tss, entry);
-	if (!node || plist_get_node_type(node) != PLIST_DICT) {
-		error("ERROR: Unable to find %s entry in TSS response\n", entry);
-		return -1;
-	}
-
-	char* path = NULL;
-	plist_t path_node = plist_dict_get_item(node, "Path");
-	if (!path_node || plist_get_node_type(path_node) != PLIST_STRING) {
-		error("ERROR: Unable to find %s path in entry\n", path);
-		return -1;
-	}
-	plist_get_string_val(path_node, &path);
-
-	char* blob = NULL;
-	uint64_t blob_size = 0;
-	plist_t blob_node = plist_dict_get_item(node, "Blob");
-	if (!blob_node || plist_get_node_type(blob_node) != PLIST_DATA) {
-		error("ERROR: Unable to find %s blob in entry\n", path);
-		free(path);
-		return -1;
-	}
-	plist_get_data_val(blob_node, &blob, &blob_size);
-
-	*ppath = path;
-	*pblob = blob;
-	return 0;
-}
-
-int get_signed_component_by_name(char* ipsw, plist_t tss, char* component, char** pdata, int* psize) {
-	int size = 0;
-	char* data = NULL;
-	char* path = NULL;
-	char* blob = NULL;
+int get_signed_component(char* ipsw, plist_t tss, const char* path, char** data, uint32_t* size) {
 	img3_file* img3 = NULL;
-	irecv_error_t error = 0;
-
-	info("Extracting %s from TSS response\n", component);
-	if (get_tss_data_by_name(tss, component, &path, &blob) < 0) {
-		error("ERROR: Unable to get data for TSS %s entry\n", component);
-		return -1;
-	}
+	uint32_t component_size = 0;
+	char* component_data = NULL;
+	char* component_blob = NULL;
 
 	info("Extracting %s from %s\n", path, ipsw);
-	if (ipsw_extract_to_memory(ipsw, path, &data, &size) < 0) {
+	if (ipsw_extract_to_memory(ipsw, path, &component_data, &component_size) < 0) {
 		error("ERROR: Unable to extract %s from %s\n", path, ipsw);
-		free(path);
-		free(blob);
 		return -1;
 	}
 
-	img3 = img3_parse_file(data, size);
+	img3 = img3_parse_file(component_data, component_size);
 	if (img3 == NULL) {
 		error("ERROR: Unable to parse IMG3: %s\n", path);
-		free(data);
-		free(path);
-		free(blob);
+		free(component_data);
 		return -1;
 	}
-	if (data) {
-		free(data);
-		data = NULL;
+	free(component_data);
+
+	if (tss_get_blob_by_path(tss, path, &component_blob) < 0) {
+		error("ERROR: Unable to get SHSH blob for TSS %s entry\n", path);
+		img3_free(img3);
+		return -1;
 	}
 
-	if (idevicerestore_custom == 0) {
-		if (img3_replace_signature(img3, blob) < 0) {
+	if (idevicerestore_device > IPOD2G_DEVICE && idevicerestore_custom == 0) {
+		if (img3_replace_signature(img3, component_blob) < 0) {
 			error("ERROR: Unable to replace IMG3 signature\n");
-			free(path);
-			free(blob);
+			free(component_blob);
+			img3_free(img3);
 			return -1;
 		}
 	}
+	free(component_blob);
 
-	if (img3_get_data(img3, &data, &size) < 0) {
+	if (img3_get_data(img3, &component_data, &component_size) < 0) {
 		error("ERROR: Unable to reconstruct IMG3\n");
 		img3_free(img3);
-		free(path);
 		return -1;
 	}
+	img3_free(img3);
 
 	if (idevicerestore_debug) {
 		char* out = strrchr(path, '/');
 		if (out != NULL) {
 			out++;
 		} else {
-			out = path;
+			out = (char*) path;
 		}
-		write_file(out, data, size);
-	}
-
-	if (img3) {
-		img3_free(img3);
-		img3 = NULL;
-	}
-	if (blob) {
-		free(blob);
-		blob = NULL;
-	}
-	if (path) {
-		free(path);
-		path = NULL;
+		write_file(out, component_data, component_size);
 	}
 
-	*pdata = data;
-	*psize = size;
+	*data = component_data;
+	*size = component_size;
 	return 0;
 }
 
-int get_signed_component_by_path(char* ipsw, plist_t tss, char* path, char** pdata, int* psize) {
-	int size = 0;
-	char* data = NULL;
-	char* name = NULL;
-	char* blob = NULL;
-	img3_file* img3 = NULL;
-	irecv_error_t error = 0;
-
-	info("Extracting %s from TSS response\n", path);
-	if (get_tss_data_by_path(tss, path, &name, &blob) < 0) {
-		error("ERROR: Unable to get data for TSS %s entry\n", path);
-		return -1;
-	}
-
-	info("Extracting %s from %s\n", path, ipsw);
-	if (ipsw_extract_to_memory(ipsw, path, &data, &size) < 0) {
-		error("ERROR: Unable to extract %s from %s\n", path, ipsw);
-		free(path);
-		free(blob);
-		return -1;
-	}
-
-	img3 = img3_parse_file(data, size);
-	if (img3 == NULL) {
-		error("ERROR: Unable to parse IMG3: %s\n", path);
-		free(data);
-		free(path);
-		free(blob);
+int write_file(const char* filename, const char* data, uint32_t size) {
+	info("Writing data to %s\n", filename);
+	FILE* file = fopen(filename, "wb");
+	if (file == NULL) {
+		error("read_file: Unable to open file %s\n", filename);
 		return -1;
 	}
-	if (data) {
-		free(data);
-		data = NULL;
-	}
 
-	if (idevicerestore_custom == 0) {
-		if (img3_replace_signature(img3, blob) < 0) {
-			error("ERROR: Unable to replace IMG3 signature\n");
-			free(name);
-			free(blob);
-			return -1;
-		}
-	}
+	int bytes = fwrite(data, 1, size, file);
+	fclose(file);
 
-	if (img3_get_data(img3, &data, &size) < 0) {
-		error("ERROR: Unable to reconstruct IMG3\n");
-		img3_free(img3);
-		free(name);
+	if (bytes != size) {
+		error("ERROR: Unable to write entire file: %s: %d %d\n", filename, bytes, size);
 		return -1;
 	}
 
-	if (idevicerestore_debug) {
-		char* out = strrchr(path, '/');
-		if (out != NULL) {
-			out++;
-		} else {
-			out = path;
-		}
-		write_file(out, data, size);
-	}
-
-	if (img3) {
-		img3_free(img3);
-		img3 = NULL;
-	}
-	if (blob) {
-		free(blob);
-		blob = NULL;
-	}
-	if (path) {
-		free(name);
-		name = NULL;
-	}
-
-	*pdata = data;
-	*psize = size;
-	return 0;
+	return size;
 }