Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit f798901

Browse files
committed
TSS: added new tags for SE / Savage in submodules
1 parent 104f50a commit f798901

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

external/idevicerestore

external/img4tool

external/tsschecker

futurerestore/futurerestore.cpp

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,6 @@ void get_custom_component(struct idevicerestore_client_t* client, plist_t build_
559559
#endif
560560
}
561561

562-
563562
int futurerestore::doRestore(const char *ipsw){
564563
#undef reterror
565564
#define reterror(code, msg ...) { \
@@ -675,8 +674,7 @@ int futurerestore::doRestore(const char *ipsw){
675674
printf("Verified ECID in APTicket matches device ECID\n");
676675

677676
plist_t ticketIdentity = getBuildIdentityForIM4M(im4m, buildmanifest);
678-
//TODO: make this nicer!
679-
//for now a simple pointercompare should be fine, because both plist_t should point into the same buildidentity inside the buildmanifest
677+
//TO-DO: make this nicer! For now a simple pointercompare should be fine, because both plist_t should point into the same buildidentity inside the buildmanifest
680678
if (ticketIdentity != build_identity ){
681679
error("BuildIdentity selected for restore does not match APTicket\n\n");
682680
printf("BuildIdentity selected for restore:\n");
@@ -711,7 +709,6 @@ int futurerestore::doRestore(const char *ipsw){
711709

712710
plist_get_data_val(digest, &manifestDigest, &manifestDigestSize);
713711

714-
715712
if (tickethashSize == manifestDigestSize && memcmp(tickethash, manifestDigest, tickethashSize) == 0){
716713
printf("Verified APTicket to be valid for this restore\n");
717714
free(manifestDigest);
@@ -722,7 +719,6 @@ int futurerestore::doRestore(const char *ipsw){
722719
}
723720
}
724721

725-
726722
if (_basebandbuildmanifest){
727723
if (!(client->basebandBuildIdentity = getBuildidentityWithBoardconfig(_basebandbuildmanifest, client->device->hardware_model, _isUpdateInstall))){
728724
if (!(client->basebandBuildIdentity = getBuildidentityWithBoardconfig(_basebandbuildmanifest, client->device->hardware_model, !_isUpdateInstall))) {
@@ -777,7 +773,6 @@ int futurerestore::doRestore(const char *ipsw){
777773
enterPwnRecovery(build_identity);
778774
}
779775

780-
781776
// Get filesystem name from build identity
782777
char* fsname = NULL;
783778
if (build_identity_get_component_path(build_identity, "OS", &fsname) < 0) {
@@ -898,8 +893,6 @@ int futurerestore::doRestore(const char *ipsw){
898893
}
899894
}
900895

901-
902-
903896
if (_enterPwnRecoveryRequested){ //if pwnrecovery send all components decrypted, unless we're dealing with iOS 10
904897
if (strncmp(client->version, "10.", 3))
905898
client->recovery_custom_component_function = get_custom_component;
@@ -914,7 +907,6 @@ int futurerestore::doRestore(const char *ipsw){
914907
/* FIXME: Probably better to detect if the device is back then */
915908
sleep(7);
916909
}
917-
918910

919911
for (int i=0;getDeviceMode(true) != MODE_RECOVERY && i<40; i++) putchar('.'),usleep(USEC_PER_SEC*0.5);
920912
putchar('\n');
@@ -945,18 +937,15 @@ int futurerestore::doRestore(const char *ipsw){
945937
recovery_client_free(client);
946938
}
947939

948-
949940
if (_client->image4supported && get_tss_response(client, sep_build_identity, &client->septss) < 0) {
950941
reterror(-11,"ERROR: Unable to get SHSH blobs for SEP\n");
951942
}
952943

953944

954-
955945
if (_client->image4supported && (!_client->sepfwdatasize || !_client->sepfwdata))
956946
reterror(-55, "SEP not loaded, refusing to continue");
957947

958948

959-
960949
if (client->mode->index == MODE_RESTORE) {
961950
info("About to restore device... \n");
962951
canExitRecovery = false;
@@ -968,7 +957,6 @@ int futurerestore::doRestore(const char *ipsw){
968957

969958
info("Cleaning up...\n");
970959

971-
972960
error:
973961
safeFree(client->sepfwdata);
974962
safePlistFree(buildmanifest);

0 commit comments

Comments
 (0)