mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-07-23 20:08:17 +00:00
Code Issues Projects Releases Wiki Activity

using tsschecker's fallback for bbgcid if device is already connected in recovery (there are still some problems if tsschecker's bbgcid is wrong/does not exist)

Browse source
This commit is contained in:
tihmstar 2016-12-31 14:42:02 +01:00
parent b991cfa441
commit 1e225977f5
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
futurerestore/futurerestore.cpp
View file

@ -227,7 +227,10 @@ void futurerestore::loadAPTickets(const vector<const char *> &apticketPaths){
uint64_t futurerestore::getBasebandGoldCertIDFromDevice(){ uint64_t futurerestore::getBasebandGoldCertIDFromDevice(){
if (!_client->preflight_info){ if (!_client->preflight_info){
normal_get_preflight_info(_client, &_client->preflight_info); if (normal_get_preflight_info(_client, &_client->preflight_info) == -1){
printf("[WARNING] failed to read BasebandGoldCertID from device! Is it already in recovery?\n");
return 0;
}
} }
plist_t node; plist_t node;
node = plist_dict_get_item(_client->preflight_info, "CertID"); node = plist_dict_get_item(_client->preflight_info, "CertID");

12
futurerestore/main.cpp
View file

@ -172,13 +172,13 @@ int main(int argc, const char * argv[]) {
} }
versVals.basebandMode = kBasebandModeOnlyBaseband; versVals.basebandMode = kBasebandModeOnlyBaseband;
if ((devVals.bbgcid = client.getBasebandGoldCertIDFromDevice())){ if (!(devVals.bbgcid = client.getBasebandGoldCertIDFromDevice())){
if (!(isBasebandSigned = isManifestSignedForDevice(client.basebandManifestPath(), &devVals, &versVals))) { printf("[WARNING] using tsschecker's fallback to get BasebandGoldCertID. This might result in invalid baseband signing status information\n");
reterror(-3,"baseband firmware isn't signed\n");
}
}else{
reterror(-3,"unable to get bbgcid from device\n");
} }
if (!(isBasebandSigned = isManifestSignedForDevice(client.basebandManifestPath(), &devVals, &versVals))) {
reterror(-3,"baseband firmware isn't signed\n");
}
client.putDeviceIntoRecovery(); client.putDeviceIntoRecovery();
if (flags & FLAG_WAIT){ if (flags & FLAG_WAIT){