mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-06-30 14:48:15 +00:00
Code Issues Projects Releases Wiki Activity

Wording fixes (#63)

Browse source
This commit is contained in:
verygenericname 2022-03-21 00:09:42 -04:00 committed by GitHub
parent 1c29b9bcea
commit 04f8b7d4f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
futurerestore/futurerestore.cpp
View file

@ -920,7 +920,7 @@ void futurerestore::doRestore(const char *ipsw) {
plist_t manifest = plist_dict_get_item(build_identity, "Manifest"); //this is the buildidentity used for restore plist_t manifest = plist_dict_get_item(build_identity, "Manifest"); //this is the buildidentity used for restore
printf("checking APTicket to be valid for this restore...\n"); //if we are in pwnDFU, just use first APTicket. We don't need to check nonces. printf("checking if the APTicket is valid for this restore...\n"); //if we are in pwnDFU, just use first APTicket. We don't need to check nonces.
auto im4m = (_enterPwnRecoveryRequested || _rerestoreiOS9) ? _im4ms.at(0) : nonceMatchesIM4Ms(); auto im4m = (_enterPwnRecoveryRequested || _rerestoreiOS9) ? _im4ms.at(0) : nonceMatchesIM4Ms();
uint64_t deviceEcid = getDeviceEcid(); uint64_t deviceEcid = getDeviceEcid();
@ -935,7 +935,7 @@ void futurerestore::doRestore(const char *ipsw) {
retassure(im4mEcid, "Failed to read ECID from APTicket\n"); retassure(im4mEcid, "Failed to read ECID from APTicket\n");
if (im4mEcid != deviceEcid) { if (im4mEcid != deviceEcid) {
error("ECID inside APTicket does not match device ECID\n"); error("ECID inside of the APTicket does not match the device's ECID\n");
printf("APTicket is valid for %16llu (dec) but device is %16llu (dec)\n", im4mEcid, deviceEcid); printf("APTicket is valid for %16llu (dec) but device is %16llu (dec)\n", im4mEcid, deviceEcid);
if (_skipBlob) { if (_skipBlob) {
info("[WARNING] NOT VALIDATING SHSH BLOBS ECID!\n"); info("[WARNING] NOT VALIDATING SHSH BLOBS ECID!\n");
@ -943,13 +943,13 @@ void futurerestore::doRestore(const char *ipsw) {
reterror("APTicket can't be used for restoring this device\n"); reterror("APTicket can't be used for restoring this device\n");
} }
} else } else
printf("Verified ECID in APTicket matches device ECID\n"); printf("Verified ECID in APTicket matches the device's ECID\n");
if (_client->image4supported) { if (_client->image4supported) {
printf("checking APTicket to be valid for this restore...\n"); printf("checking if the APTicket is valid for this restore...\n");
if (im4mEcid != deviceEcid) { if (im4mEcid != deviceEcid) {
error("ECID inside APTicket does not match device ECID\n"); error("ECID inside of the APTicket does not match the device's ECID\n");
printf("APTicket is valid for %16llu (dec) but device is %16llu (dec)\n", im4mEcid, deviceEcid); printf("APTicket is valid for %16llu (dec) but device is %16llu (dec)\n", im4mEcid, deviceEcid);
if (_skipBlob) { if (_skipBlob) {
info("[WARNING] NOT VALIDATING SHSH BLOBS ECID!\n"); info("[WARNING] NOT VALIDATING SHSH BLOBS ECID!\n");
@ -957,7 +957,7 @@ void futurerestore::doRestore(const char *ipsw) {
reterror("APTicket can't be used for restoring this device\n"); reterror("APTicket can't be used for restoring this device\n");
} }
} else } else
printf("Verified ECID in APTicket matches device ECID\n"); printf("Verified ECID in APTicket matches the device's ECID\n");
plist_t ticketIdentity = nullptr; plist_t ticketIdentity = nullptr;
@ -1049,7 +1049,7 @@ void futurerestore::doRestore(const char *ipsw) {
retassure(_client->basebandBuildIdentity, "BasebandBuildIdentity not loaded, refusing to continue"); retassure(_client->basebandBuildIdentity, "BasebandBuildIdentity not loaded, refusing to continue");
} else { } else {
warning("WARNING: we don't have a basebandbuildmanifest, does not flashing baseband!\n"); warning("WARNING: we don't have a BasebandBuildManifest, won't flash baseband!\n");
} }
if (_client->image4supported) { if (_client->image4supported) {
@ -1318,7 +1318,7 @@ void futurerestore::doRestore(const char *ipsw) {
debug("Waiting for device to enter restore mode...\n"); debug("Waiting for device to enter restore mode...\n");
cond_wait_timeout(&client->device_event_cond, &client->device_event_mutex, 180000); cond_wait_timeout(&client->device_event_cond, &client->device_event_mutex, 180000);
retassure((client->mode == MODE_RESTORE || (mutex_unlock(&client->device_event_mutex), 0)), retassure((client->mode == MODE_RESTORE || (mutex_unlock(&client->device_event_mutex), 0)),
"Device can't enter to restore mode"); "Unable to place device into restore mode");
mutex_unlock(&client->device_event_mutex); mutex_unlock(&client->device_event_mutex);
info("About to restore device... \n"); info("About to restore device... \n");