From 677a85269605bcf0613d9011b72bb7d4150ce327 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Mon, 18 Nov 2013 18:18:51 +0100
Subject: idevicerestore: Remove obsolete arguments from get_shsh_blobs()

---
 src/dfu.c            | 2 +-
 src/idevicerestore.c | 8 ++++----
 src/idevicerestore.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/dfu.c b/src/dfu.c
index e38ddb0..9393fe8 100644
--- a/src/dfu.c
+++ b/src/dfu.c
@@ -326,7 +326,7 @@ int dfu_enter_recovery(struct idevicerestore_client_t* client, plist_t build_ide
 		if (nonce_changed && !(client->flags & FLAG_CUSTOM)) {
 			// Welcome iOS5. We have to re-request the TSS with our nonce.
 			plist_free(client->tss);
-			if (get_shsh_blobs(client, client->ecid, client->nonce, client->nonce_size, build_identity, &client->tss) < 0) {
+			if (get_shsh_blobs(client, build_identity, &client->tss) < 0) {
 				error("ERROR: Unable to get SHSH blobs for this device\n");
 				return -1;
 			}
diff --git a/src/idevicerestore.c b/src/idevicerestore.c
index 0cd5a14..d1f3c00 100644
--- a/src/idevicerestore.c
+++ b/src/idevicerestore.c
@@ -579,7 +579,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client)
 			}
 		}
 
-		if (get_shsh_blobs(client, client->ecid, client->nonce, client->nonce_size, build_identity, &client->tss) < 0) {
+		if (get_shsh_blobs(client, build_identity, &client->tss) < 0) {
 			error("ERROR: Unable to get SHSH blobs for this device\n");
 			return -1;
 		}
@@ -833,7 +833,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client)
 		if (nonce_changed && !(client->flags & FLAG_CUSTOM)) {
 			// Welcome iOS5. We have to re-request the TSS with our nonce.
 			plist_free(client->tss);
-			if (get_shsh_blobs(client, client->ecid, client->nonce, client->nonce_size, build_identity, &client->tss) < 0) {
+			if (get_shsh_blobs(client, build_identity, &client->tss) < 0) {
 				error("ERROR: Unable to get SHSH blobs for this device\n");
 				if (delete_fs && filesystem)
 					unlink(filesystem);
@@ -1322,7 +1322,7 @@ plist_t build_manifest_get_build_identity(plist_t build_manifest, uint32_t ident
 	return plist_copy(build_identity);
 }
 
-int get_shsh_blobs(struct idevicerestore_client_t* client, uint64_t ecid, unsigned char* nonce, int nonce_size, plist_t build_identity, plist_t* tss) {
+int get_shsh_blobs(struct idevicerestore_client_t* client, plist_t build_identity, plist_t* tss) {
 	plist_t request = NULL;
 	plist_t response = NULL;
 	*tss = NULL;
@@ -1389,7 +1389,7 @@ int get_shsh_blobs(struct idevicerestore_client_t* client, uint64_t ecid, unsign
 		info("Trying to fetch new SHSH blob\n");
 	}
 
-	request = tss_create_request(build_identity, ecid, nonce, nonce_size);
+	request = tss_create_request(build_identity, client->ecid, client->nonce, client->nonce_size);
 	if (request == NULL) {
 		error("ERROR: Unable to create TSS request\n");
 		return -1;
diff --git a/src/idevicerestore.h b/src/idevicerestore.h
index a04ec66..e289ed0 100644
--- a/src/idevicerestore.h
+++ b/src/idevicerestore.h
@@ -78,7 +78,7 @@ int get_ecid(struct idevicerestore_client_t* client, uint64_t* ecid);
 int get_bdid(struct idevicerestore_client_t* client, uint32_t* bdid);
 int get_cpid(struct idevicerestore_client_t* client, uint32_t* cpid);
 int get_nonce(struct idevicerestore_client_t* client, unsigned char** nonce, int* nonce_size);
-int get_shsh_blobs(struct idevicerestore_client_t* client, uint64_t ecid, unsigned char* nonce, int nonce_size, plist_t build_identity, plist_t* tss);
+int get_shsh_blobs(struct idevicerestore_client_t* client, plist_t build_identity, plist_t* tss);
 void fixup_tss(plist_t tss);
 int build_manifest_get_identity_count(plist_t build_manifest);
 int build_manifest_check_compatibility(plist_t build_manifest, const char* product);
-- 
cgit v1.1-32-gdbae