More fix attempts for bbdigest/bbreplace

last for now.

Author: LukeZGD

restore.sh

@@ -4235,13 +4235,11 @@ replace_plist_data() {
 }
 
 ipsw_bbdigest() {
-    local loc="BuildIdentities:0:"
     local loc_sub=
     if [[ $2 != "UniqueBuildID" ]]; then
         loc_sub="Manifest:BasebandFirmware:"
     fi
     loc_sub+="$2"
-    loc+="$loc_sub"
 
     local out="$1"
     log "Replacing $2"
@@ -4280,12 +4278,12 @@ ipsw_bbdigest() {
 }
 
 ipsw_bbreplace() {
-    local rsb1
-    local sbl1
-    local path
+    local rsb1=()
+    local sbl1=()
+    local path=()
     local rsb_latest
     local sbl_latest
-    local bbfw="Print BuildIdentities:0:Manifest:BasebandFirmware"
+    local loc_sub="Manifest:BasebandFirmware"
     local ubid
     if [[ $device_type == "iPad2,6" || $device_type == "iPad2,7" || $device_type == "iPhone5,2" ||
           $device_type == "iPhone5,3" || $device_type == "iPhone5,4" ]] &&
@@ -4296,6 +4294,12 @@ ipsw_bbreplace() {
         return
     fi
 
+    local ind=(0)
+    if [[ $device_proc == 6 && $target_vers_maj == 10 ]]; then
+        ind+=(2 4)
+        [[ $device_type == "iPhone5,"* ]] && ind+=(6)
+    fi
+
     if [[ $1 != "exist" ]]; then
         log "Extracting BuildManifest from IPSW"
         file_extract_from_archive temp.ipsw BuildManifest.plist
@@ -4306,22 +4310,22 @@ ipsw_bbreplace() {
 
     case $device_type in
         iPhone4,1 ) ubid="d9Xbp0xyiFOxDvUcKMsoNjIvhwQ=";;
-        iPhone5,1 ) ubid="IcrFKRzWDvccKDfkfMNPOPYHEV0=";;
-        iPhone5,2 ) ubid="IcrFKRzWDvccKDfkfMNPOPYHEV0=";; # iPhone5,1 ubid. orig: lnU0rtBUK6gCyXhEtHuwbEz/IKY=
+        iPhone5,1 ) ubid="849RPGQ9kNXGMztIQBhVoU/l5lM=";; # iPad3,5 ubid. orig: IcrFKRzWDvccKDfkfMNPOPYHEV0=
+        iPhone5,2 ) ubid="849RPGQ9kNXGMztIQBhVoU/l5lM=";; # iPad3,5 ubid. orig: lnU0rtBUK6gCyXhEtHuwbEz/IKY=
         iPhone5,3 ) ubid="lnoGRL1B+Be2mF6Y6FNio8TPxM8=";; # iPhone6,1 ubid. orig: 5MDMapCrTG5J33jbtOLgWNLwzKs=
         iPhone5,4 ) ubid="EHCDmDBeezNwTZsyiWYWQCllnz4=";; # iPhone6,2 ubid. orig: Z4ST0TczwAhpfluQFQNBg7Y3BVE=
-        iPad2,6   ) ubid="IcrFKRzWDvccKDfkfMNPOPYHEV0=";; # iPhone5,1 ubid. orig: L73HfN42pH7qAzlWmsEuIZZg2oE=
-        iPad2,7   ) ubid="IcrFKRzWDvccKDfkfMNPOPYHEV0=";; # iPhone5,1 ubid. orig: z/vJsvnUovZ+RGyXKSFB6DOjt1k=
+        iPad2,6   ) ubid="849RPGQ9kNXGMztIQBhVoU/l5lM=";; # iPad3,5 ubid. orig: L73HfN42pH7qAzlWmsEuIZZg2oE=
+        iPad2,7   ) ubid="849RPGQ9kNXGMztIQBhVoU/l5lM=";; # iPad3,5 ubid. orig: z/vJsvnUovZ+RGyXKSFB6DOjt1k=
         iPad3,5   ) ubid="849RPGQ9kNXGMztIQBhVoU/l5lM=";;
         iPad3,6   ) ubid="cO+N+Eo8ynFf+0rnsIWIQHTo6rg=";;
     esac
     ipsw_bbdigest $ubid UniqueBuildID
 
     case $device_type in
         iPhone4,1 )
-            rsb1=$($PlistBuddy -c "$bbfw:eDBL-Version" BuildManifest.plist)
-            sbl1=$($PlistBuddy -c "$bbfw:RestoreDBL-Version" BuildManifest.plist)
-            path=$($PlistBuddy -c "$bbfw:Info:Path" BuildManifest.plist | tr -d '"')
+            rsb1[0]=$($PlistBuddy -c "Print BuildIdentities:0:$loc_sub:eDBL-Version" BuildManifest.plist)
+            sbl1[0]=$($PlistBuddy -c "Print BuildIdentities:0:$loc_sub:RestoreDBL-Version" BuildManifest.plist)
+            path[0]=$($PlistBuddy -c "Print BuildIdentities:0:$loc_sub:Info:Path" BuildManifest.plist | tr -d '"')
             rsb_latest="-1577031936"
             sbl_latest="-1575983360"
             ipsw_bbdigest XAAAAADHAQCqerR8d+PvcfusucizfQ4ECBI0TA== RestoreDBL-PartialDigest
@@ -4331,9 +4335,11 @@ ipsw_bbreplace() {
             ipsw_bbdigest 3CHVk7EmtGjL14ApDND81cqFqhM= AMSS-DownloadDigest
         ;;
         iPhone5,[12] | iPad2,[67] | iPad3,[56] )
-            rsb1=$($PlistBuddy -c "$bbfw:RestoreSBL1-Version" BuildManifest.plist)
-            sbl1=$($PlistBuddy -c "$bbfw:SBL1-Version" BuildManifest.plist)
-            path=$($PlistBuddy -c "$bbfw:Info:Path" BuildManifest.plist | tr -d '"')
+            for i in "${ind[@]}"; do
+                rsb1[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:RestoreSBL1-Version" BuildManifest.plist)
+                sbl1[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:SBL1-Version" BuildManifest.plist)
+                path[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:Info:Path" BuildManifest.plist | tr -d '"')
+            done
             rsb_latest="-1559114512"
             sbl_latest="-1560163088"
             ipsw_bbdigest 2bmJ7Vd+WAmogV+hjq1a86UlBvA= APPS-DownloadDigest
@@ -4350,9 +4356,11 @@ ipsw_bbreplace() {
             ipsw_bbdigest kHLoJsT9APu4Xwu/aRjNK10Hx84= SBL2-DownloadDigest
         ;;
         iPhone5,[34] )
-            rsb1=$($PlistBuddy -c "$bbfw:RestoreSBL1-Version" BuildManifest.plist)
-            sbl1=$($PlistBuddy -c "$bbfw:SBL1-Version" BuildManifest.plist)
-            path=$($PlistBuddy -c "$bbfw:Info:Path" BuildManifest.plist | tr -d '"')
+            for i in "${ind[@]}"; do
+                rsb1[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:RestoreSBL1-Version" BuildManifest.plist)
+                sbl1[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:SBL1-Version" BuildManifest.plist)
+                path[$i]=$($PlistBuddy -c "Print BuildIdentities:$i:$loc_sub:Info:Path" BuildManifest.plist | tr -d '"')
+            done
             rsb_latest="-1542379296"
             sbl_latest="-1543427872"
             ipsw_bbdigest TSVi7eYY4FiAzXynDVik6TY2S1c= APPS-DownloadDigest
@@ -4370,13 +4378,15 @@ ipsw_bbreplace() {
         ;;
     esac
 
-    log "Replacing $rsb1 with $rsb_latest"
-    log "Replacing $sbl1 with $sbl_latest"
-    log "Replacing $path with Firmware/$device_use_bb"
-    sed -e "s,$rsb1,$rsb_latest," \
-        -e "s,$sbl1,$sbl_latest," \
-        -e "s,$path,Firmware/$device_use_bb," BuildManifest.plist > tmp.plist
-    mv tmp.plist BuildManifest.plist
+    for i in "${ind[@]}"; do
+        log "Replacing ${rsb1[$i]} with $rsb_latest"
+        log "Replacing ${sbl1[$i]} with $sbl_latest"
+        log "Replacing ${path[$i]} with Firmware/$device_use_bb"
+        sed -e "s,${rsb1[$i]},$rsb_latest," \
+            -e "s,${sbl1[$i]},$sbl_latest," \
+            -e "s,${path[$i]},Firmware/$device_use_bb," BuildManifest.plist > tmp.plist
+        mv tmp.plist BuildManifest.plist
+    done
 
     zip -r0 temp.ipsw Firmware/$device_use_bb BuildManifest.plist
 }