Add iPwnder32 as option for pwnDFU

This commit is contained in:
LukeeGD 2020-09-13 20:51:26 +08:00
parent 52594bad6e
commit 3294372ea1
4 changed files with 26 additions and 5 deletions

View File

@ -71,6 +71,7 @@
- cURL - cURL
- bspatch - bspatch
- [ipwndfu](https://github.com/LukeZGD/ipwndfu) - [ipwndfu](https://github.com/LukeZGD/ipwndfu)
- [iPwnder32](https://github.com/dora2-iOS/iPwnder32)
- [irecovery](https://github.com/LukeZGD/libirecovery) - [irecovery](https://github.com/LukeZGD/libirecovery)
- [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice) - [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice)
- [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) (macOS) - [imobiledevice-net](https://github.com/libimobiledevice-win32/imobiledevice-net) (macOS)

BIN
resources/tools/pwnedDFU_linux Executable file

Binary file not shown.

Binary file not shown.

View File

@ -44,6 +44,7 @@ function Main {
ideviceinfo="ideviceinfo" ideviceinfo="ideviceinfo"
iproxy="iproxy" iproxy="iproxy"
irecovery="env LD_LIBRARY_PATH=resources/lib /usr/local/bin/irecovery" irecovery="env LD_LIBRARY_PATH=resources/lib /usr/local/bin/irecovery"
pwnedDFU="sudo LD_LIBRARY_PATH=resources/lib resources/tools/pwnedDFU_$platform"
python="python2" python="python2"
futurerestore1="sudo LD_PRELOAD=resources/lib/libcurl.so.3 LD_LIBRARY_PATH=resources/lib resources/tools/futurerestore1_linux" futurerestore1="sudo LD_PRELOAD=resources/lib/libcurl.so.3 LD_LIBRARY_PATH=resources/lib resources/tools/futurerestore1_linux"
futurerestore2="sudo LD_LIBRARY_PATH=resources/lib resources/tools/futurerestore2_linux" futurerestore2="sudo LD_LIBRARY_PATH=resources/lib resources/tools/futurerestore2_linux"
@ -57,6 +58,7 @@ function Main {
ideviceinfo="resources/libimobiledevice_$platform/ideviceinfo" ideviceinfo="resources/libimobiledevice_$platform/ideviceinfo"
iproxy="resources/libimobiledevice_$platform/iproxy" iproxy="resources/libimobiledevice_$platform/iproxy"
irecovery="resources/libimobiledevice_$platform/irecovery" irecovery="resources/libimobiledevice_$platform/irecovery"
pwnedDFU="resources/tools/pwnedDFU_$platform"
python="python" python="python"
futurerestore1="resources/tools/futurerestore1_$platform" futurerestore1="resources/tools/futurerestore1_$platform"
futurerestore2="resources/tools/futurerestore2_$platform" futurerestore2="resources/tools/futurerestore2_$platform"
@ -309,10 +311,27 @@ function Recovery {
function CheckM8 { function CheckM8 {
DFUManual=1 DFUManual=1
[[ $A7Device == 1 ]] && echo -e "\n$(Log 'Device in DFU mode detected.')" [[ $A7Device == 1 ]] && echo -e "\n$(Log 'Device in DFU mode detected.')"
Log "Entering pwnDFU mode with ipwndfu..." [[ $platform == macos ]] && Selection=("iPwnder32" "ipwndfu") || Selection=("ipwndfu" "iPwnder32")
cd resources/ipwndfu Input "Select pwnDFU tool to use (press ENTER when unsure):"
sudo $python ipwndfu -p Echo "* iPwnder32 is recommended for macOS"
pwnDFUDevice=$? Echo "* ipwndfu is recommended for Linux (not sure if I correctly compiled iPwnder32 for Linux)"
select opt in "${Selection[@]}"; do
case $opt in
"ipwndfu" ) pwnDFUTool="ipwndfu"; break;;
"iPwnder32" ) pwnDFUTool="iPwnder32"; break;;
*) pwnDFUTool="${Selection[0]}"; break;;
esac
done
Log "Entering pwnDFU mode with $pwnDFUTool..."
if [[ $pwnDFUTool == "ipwndfu" ]]; then
cd resources/ipwndfu
sudo $python ipwndfu -p
pwnDFUDevice=$?
elif [[ $pwnDFUTool == "iPwnder32" ]]; then
$pwnedDFU -p -f
pwnDFUDevice=$?
cd resources/ipwndfu
fi
if [[ $pwnDFUDevice == 0 ]]; then if [[ $pwnDFUDevice == 0 ]]; then
Log "Device in pwnDFU mode detected." Log "Device in pwnDFU mode detected."
if [[ $A7Device == 1 ]]; then if [[ $A7Device == 1 ]]; then
@ -521,7 +540,8 @@ function InstallDependencies {
if [[ $platform == linux ]]; then if [[ $platform == linux ]]; then
Compile LukeZGD libirecovery Compile LukeZGD libirecovery
ln -sf /usr/local/lib/libirecovery-1.0.so.3 ../resources/lib/libirecovery-1.0.so.3 ln -sf /usr/local/lib/libirecovery.so.3 ../resources/lib/libirecovery-1.0.so.3
ln -sf /usr/local/lib/libirecovery.so.3 ../resources/lib/libirecovery.so.3
else else
rm -rf ../resources/libimobiledevice_$platform rm -rf ../resources/libimobiledevice_$platform
mkdir ../resources/libimobiledevice_$platform mkdir ../resources/libimobiledevice_$platform