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

Hacky pwndfu support

Browse source 
Use my liboffsetfinder64 fork for it to work properly
Use libipatcher's wikiproxy python script for keyserver
This commit is contained in:
Cryptiiiic 2021-04-11 18:27:11 -07:00
parent f1ce1234ef
commit 9bff1c4e9b
No known key found for this signature in database
GPG key ID: 4CCAE32CC026C76D
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
futurerestore/futurerestore.cpp
View file

@ -451,12 +451,15 @@ void futurerestore::enterPwnRecovery(plist_t build_identity, string bootargs){
#ifndef HAVE_LIBIPATCHER #ifndef HAVE_LIBIPATCHER
reterror("compiled without libipatcher"); reterror("compiled without libipatcher");
#else #else
if (_client->image4supported) { if (_client->image4supported) {
retassure(libipatcher::has64bitSupport(), "libipatcher was compiled without 64-bit support"); retassure(libipatcher::has64bitSupport(), "libipatcher was compiled without 64-bit support");
std::string generator = getGeneratorFromSHSH2(_client->tss); std::string generator = getGeneratorFromSHSH2(_client->tss);
retassure(img4tool::isGeneratorValidForIM4M({_im4ms[0].first,_im4ms[0].second}, generator), "generator returned from device is not valid from APTicket"); retassure(img4tool::isGeneratorValidForIM4M({_im4ms[0].first,_im4ms[0].second}, generator), "generator returned from device is not valid from APTicket");
} }
irecv_device_event_subscribe(&_client->irecv_e_ctx, irecv_event_cb, _client);
idevice_event_subscribe(idevice_event_cb, _client);
int mode = 0; int mode = 0;
libipatcher::fw_key iBSSKeys; libipatcher::fw_key iBSSKeys;
libipatcher::fw_key iBECKeys; libipatcher::fw_key iBECKeys;
@ -498,21 +501,18 @@ void futurerestore::enterPwnRecovery(plist_t build_identity, string bootargs){
mutex_lock(&_client->device_event_mutex); mutex_lock(&_client->device_event_mutex);
irecv_error_t err = irecv_send_buffer(_client->dfu->client, (unsigned char*)(char*)iBSS.first, (unsigned long)iBSS.second, 1); irecv_error_t err = irecv_send_buffer(_client->dfu->client, (unsigned char*)(char*)iBSS.first, (unsigned long)iBSS.second, 1);
retassure(err == IRECV_E_SUCCESS,"ERROR: Unable to send %s component: %s\n", "iBSS", irecv_strerror(err)); retassure(err == IRECV_E_SUCCESS,"ERROR: Unable to send %s component: %s\n", "iBSS", irecv_strerror(err));
mutex_unlock(&_client->device_event_mutex);
/* reconnect */ /* reconnect */
dfu_client_free(_client); // dfu_client_free(_client);
debug("Waiting for device to disconnect...\n");
cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000);
retassure((_client->mode == &idevicerestore_modes[MODE_UNKNOWN] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not disconnect. Possibly invalid iBSS. Reset device and try again");
mutex_unlock(&_client->device_event_mutex);
debug("Waiting for device to reconnect...\n"); debug("Waiting for device to reconnect...\n");
mutex_lock(&_client->device_event_mutex); // mutex_lock(&_client->device_event_mutex);
cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000); // cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 60000);
retassure((_client->mode == &idevicerestore_modes[MODE_DFU] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not disconnect. Possibly invalid iBSS. Reset device and try again"); // retassure((_client->mode == &idevicerestore_modes[MODE_RECOVERY] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not disconnect. Possibly invalid iBSS. Reset device and try again");
mutex_unlock(&_client->device_event_mutex); // mutex_unlock(&_client->device_event_mutex);
dfu_client_free(_client);
sleep(10);
dfu_client_new(_client); dfu_client_new(_client);
} }
@ -523,21 +523,25 @@ void futurerestore::enterPwnRecovery(plist_t build_identity, string bootargs){
mutex_lock(&_client->device_event_mutex); mutex_lock(&_client->device_event_mutex);
irecv_error_t err = irecv_send_buffer(_client->dfu->client, (unsigned char*)(char*)iBEC.first, (unsigned long)iBEC.second, 1); irecv_error_t err = irecv_send_buffer(_client->dfu->client, (unsigned char*)(char*)iBEC.first, (unsigned long)iBEC.second, 1);
retassure(err == IRECV_E_SUCCESS,"ERROR: Unable to send %s component: %s\n", "iBEC", irecv_strerror(err)); retassure(err == IRECV_E_SUCCESS,"ERROR: Unable to send %s component: %s\n", "iBEC", irecv_strerror(err));
printf("waiting for device to reconnect...\n"); // printf("waiting for device to reconnect...\n");
if (modeIsRecovery){ // if (modeIsRecovery){
irecv_send_command(_client->dfu->client, "go"); irecv_send_command(_client->dfu->client, "go");
recovery_client_free(_client);
}else{
dfu_client_free(_client);
}
debug("Waiting for device to disconnect...\n");
cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000);
/* retassure((_client->mode == &idevicerestore_modes[MODE_UNKNOWN] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not disconnect. Possibly invalid iBEC. Reset device and try again"); */
mutex_unlock(&_client->device_event_mutex); mutex_unlock(&_client->device_event_mutex);
// recovery_client_free(_client);
sleep(10);
// recovery_client_new(_client);
// }else{
// dfu_client_free(_client);
// }
// debug("Waiting for device to disconnect...\n");
// cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000);
/* retassure((_client->mode == &idevicerestore_modes[MODE_UNKNOWN] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not disconnect. Possibly invalid iBEC. Reset device and try again"); */
// mutex_unlock(&_client->device_event_mutex);
} }
debug("Waiting for device to reconnect...\n"); debug("Waiting for device to reconnect...\n");
// recovery_client_new(_client);
mutex_lock(&_client->device_event_mutex); mutex_lock(&_client->device_event_mutex);
cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000); cond_wait_timeout(&_client->device_event_cond, &_client->device_event_mutex, 10000);
retassure((_client->mode == &idevicerestore_modes[MODE_RECOVERY] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not reconnect. Possibly invalid iBEC. Reset device and try again"); retassure((_client->mode == &idevicerestore_modes[MODE_RECOVERY] || (mutex_unlock(&_client->device_event_mutex),0)), "Device did not reconnect. Possibly invalid iBEC. Reset device and try again");