Update pwnDFU stuff 2

This commit is contained in:
LukeZGD 2023-10-13 20:06:39 +08:00
parent 5a6e3d9f9c
commit 4c4ab407b6

View File

@ -1177,15 +1177,18 @@ device_enter_mode() {
$gaster pwn $gaster pwn
tool_pwned=$? tool_pwned=$?
$gaster reset $gaster reset
elif [[ $device_type == "iPod2,1" ]]; then
# ipod touch 2g uses ipwndfu
device_ipwndfu pwn
elif [[ $platform == "linux" ]]; then elif [[ $platform == "linux" ]]; then
if [[ $device_proc == 6 || $device_type == "iPod2,1" ]]; then if [[ $device_proc == 4 ]]; then
# ipod touch 2g and A6 linux use ipwndfu
device_ipwndfu pwn
elif [[ $device_proc == 4 ]]; then
# A4 linux uses ipwnder # A4 linux uses ipwnder
log "Placing device to pwnDFU mode using ipwnder" log "Placing device to pwnDFU mode using ipwnder"
$ipwnder -p $ipwnder -p
tool_pwned=$? tool_pwned=$?
elif [[ $device_proc == 6 ]]; then
# A6 linux uses ipwndfu
device_ipwndfu pwn
else else
# A7 linux uses gaster # A7 linux uses gaster
log "Placing device to pwnDFU mode using gaster" log "Placing device to pwnDFU mode using gaster"
@ -1206,12 +1209,8 @@ device_enter_mode() {
$opt $opt
tool_pwned=$? tool_pwned=$?
else else
# A4 mac/A6 intel mac uses ipwnder_lite/ipwnder32 # A4/A6/A7 mac uses ipwnder32/ipwnder_lite
# A7 intel mac uses ipwnder_lite/ipwnder32/gaster
local selection=("ipwnder32" "ipwnder_lite") local selection=("ipwnder32" "ipwnder_lite")
if [[ $device_proc == 7 ]]; then
selection+=("gaster")
fi
input "PwnDFU Tool Option" input "PwnDFU Tool Option"
print "* Select tool to be used for entering pwned DFU mode." print "* Select tool to be used for entering pwned DFU mode."
print "* This option is set to ipwnder32 by default (1). Select this option if unsure." print "* This option is set to ipwnder32 by default (1). Select this option if unsure."
@ -1219,7 +1218,6 @@ device_enter_mode() {
input "Select your option:" input "Select your option:"
select opt2 in "${selection[@]}"; do select opt2 in "${selection[@]}"; do
case $opt2 in case $opt2 in
"gaster" ) opt="$gaster pwn"; break;;
"ipwnder32" ) opt="$ipwnder32 -p"; break;; "ipwnder32" ) opt="$ipwnder32 -p"; break;;
* ) * )
opt="$ipwnder" opt="$ipwnder"
@ -1231,10 +1229,8 @@ device_enter_mode() {
esac esac
done done
log "Placing device to pwnDFU mode using: $opt" log "Placing device to pwnDFU mode using: $opt"
if [[ $device_proc == 7 ]]; then if (( device_proc > 5 )); then
if [[ $(uname -m) == "x86_64" ]]; then print "* If you have an older Mac with Core 2 Duo, success rates for checkm8 are low."
print "* If you have an older Mac with Core 2 Duo, success rates for checkm8 are low."
fi
print "* Pwning using another Mac or iOS device using iPwnder Lite are available options if needed." print "* Pwning using another Mac or iOS device using iPwnder Lite are available options if needed."
print "* For more details, read the \"Troubleshooting\" wiki page in GitHub" print "* For more details, read the \"Troubleshooting\" wiki page in GitHub"
print "* Troubleshooting links:" print "* Troubleshooting links:"