diff --git a/README.md b/README.md index df13fc2..d03e44b 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ - [ipwndfu](https://github.com/LukeZGD/ipwndfu) - LukeZGD fork - [iPwnder32](https://github.com/dora2-iOS/iPwnder32) - dora2ios - [ipwnder_lite](https://github.com/dora2-iOS/ipwnder_lite) - dora2ios +- [gaster](https://github.com/0x7ff/gaster) - 0x7ff - [daibutsuCFW](https://github.com/dora2-iOS/daibutsuCFW) - dora2ios ([LukeZGD fork](https://github.com/LukeZGD/daibutsuCFW)) - [libimobiledevice](https://github.com/libimobiledevice/libimobiledevice), [libirecovery](https://github.com/libimobiledevice/libirecovery) - libimobiledevice ([macOS/Windows builds](https://github.com/libimobiledevice-win32/imobiledevice-net)) - [tsschecker](https://github.com/tihmstar/tsschecker) - tihmstar ([1Conan fork](https://github.com/1Conan/tsschecker)) diff --git a/resources/depends.sh b/resources/depends.sh index 5cd359a..3ee9d47 100755 --- a/resources/depends.sh +++ b/resources/depends.sh @@ -53,6 +53,7 @@ SetToolPaths() { fi cherrybin="../$cherry/cherry" + gaster="./resources/tools/gaster_$platform" ideviceenterrecovery="$MPath/ideviceenterrecovery" ideviceinfo="$MPath/ideviceinfo" idevicerestore="./resources/tools/idevicerestore_$platform" diff --git a/resources/device.sh b/resources/device.sh index c5fcf94..cad1689 100755 --- a/resources/device.sh +++ b/resources/device.sh @@ -212,6 +212,7 @@ EnterPwnDFU() { local pwnDFUTool local pwnDFUDevice local pwnD=1 + local Selection=() if [[ $ProductType == "iPhone3,1" ]]; then pwnDFUTool="$pwnedDFU" @@ -225,17 +226,21 @@ EnterPwnDFU() { elif [[ $platform == "macos" ]]; then pwnDFUTool="$ipwnder32" fi - elif [[ $platform == "macos" ]]; then - Selection=("ipwnder_lite" "iPwnder32") + elif [[ $platform == "macos" || $DeviceProc == 7 ]]; then + [[ $platform == "macos" ]] && Selection+=("ipwnder_lite" "iPwnder32") + [[ $DeviceProc == 7 ]] && Selection+=("gaster") + [[ $platform == "linux" ]] && Selection+=("ipwndfu") Input "PwnDFU Tool Option" Echo "* This option selects what tool to use to put your device in pwnDFU mode." - Echo "* If unsure, select 1. Select 2 if 1 does not work." + Echo "* If unsure, select 1. If 1 does not work, try selecting the other options." Echo "* This option is set to ${Selection[0]} by default (1)." Input "Select your option:" select opt in "${Selection[@]}"; do case $opt in "ipwnder_lite" ) pwnDFUTool="$ipwnder_lite"; break;; "iPwnder32" ) pwnDFUTool="$ipwnder32"; break;; + "gaster" ) pwnDFUTool="$gaster"; break;; + "ipwndfu" ) pwnDFUTool="ipwndfu"; SaveExternal ipwndfu; break;; esac done else @@ -257,6 +262,9 @@ EnterPwnDFU() { cd ../.. SendPwnediBSS fi + elif [[ $pwnDFUTool == "$gaster" ]]; then + $pwnDFUTool pwn + pwnDFUDevice=$? else $pwnDFUTool -p pwnDFUDevice=$? diff --git a/resources/tools/gaster_linux b/resources/tools/gaster_linux new file mode 100755 index 0000000..25ea9e1 Binary files /dev/null and b/resources/tools/gaster_linux differ diff --git a/resources/tools/gaster_macos b/resources/tools/gaster_macos new file mode 100755 index 0000000..7136541 Binary files /dev/null and b/resources/tools/gaster_macos differ