diff options
| author |  Martin Szulecki | 2012-09-20 21:50:42 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2012-11-07 22:19:52 +0100 |
| commit | f4bdd1ce22061638240fb56ec73eb90c95c7dbcd (patch) | |
| tree | e1d5b066d8c878d3cdcd26ebb6f8da0d226d4026 /src/idevicerestore.c | |
| parent | fde8acd97fc9179960b89e86c3850f7803a3d35c (diff) | |
| download | idevicerestore-f4bdd1ce22061638240fb56ec73eb90c95c7dbcd.tar.gz idevicerestore-f4bdd1ce22061638240fb56ec73eb90c95c7dbcd.tar.bz2 | |
client: Fix build number parsing for iOS 6
Diffstat (limited to 'src/idevicerestore.c')
| -rw-r--r-- | src/idevicerestore.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/idevicerestore.c b/src/idevicerestore.c index a5ea45d..a566e65 100644 --- a/src/idevicerestore.c +++ b/src/idevicerestore.c @@ -349,7 +349,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client) } /* print iOS information from the manifest */ - build_manifest_get_version_information(buildmanifest, &client->version, &client->build); + build_manifest_get_version_information(buildmanifest, client); info("Product Version: %s\n", client->version); info("Product Build: %s\n", client->build); @@ -756,7 +756,7 @@ int idevicerestore_start(struct idevicerestore_client_t* client) } idevicerestore_progress(client, RESTORE_STEP_PREPARE, 0.5); - if (client->build[0] > '8') { + if (client->build_major > 8) { // we need another tss request with nonce. unsigned char* nonce = NULL; int nonce_size = 0; @@ -1415,7 +1415,7 @@ int get_shsh_blobs(struct idevicerestore_client_t* client, uint64_t ecid, unsign plist_t response = NULL; *tss = NULL; - if ((client->build[0] <= '8') || (client->flags & FLAG_CUSTOM)) { + if ((client->build_major <= 8) || (client->flags & FLAG_CUSTOM)) { error("checking for local shsh\n"); /* first check for local copy */ @@ -1612,24 +1612,26 @@ int build_manifest_check_compatibility(plist_t build_manifest, const char* produ return res; } -void build_manifest_get_version_information(plist_t build_manifest, char** product_version, char** product_build) { +void build_manifest_get_version_information(plist_t build_manifest, struct idevicerestore_client_t* client) { plist_t node = NULL; - *product_version = NULL; - *product_build = NULL; + client->version = NULL; + client->build = NULL; node = plist_dict_get_item(build_manifest, "ProductVersion"); if (!node || plist_get_node_type(node) != PLIST_STRING) { error("ERROR: Unable to find ProductVersion node\n"); return; } - plist_get_string_val(node, product_version); + plist_get_string_val(node, &client->version); node = plist_dict_get_item(build_manifest, "ProductBuildVersion"); if (!node || plist_get_node_type(node) != PLIST_STRING) { error("ERROR: Unable to find ProductBuildVersion node\n"); return; } - plist_get_string_val(node, product_build); + plist_get_string_val(node, &client->build); + + client->build_major = strtoul(client->build, NULL, 10); } void build_identity_print_information(plist_t build_identity) { |