Check SSH version (fixes #377)

LukeZGD · Jan 7, 2024 · 73583a7 · 73583a7
1 parent 14963e9
commit 73583a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/resources/ssh_config b/resources/ssh_config
@@ -4,4 +4,3 @@ Host *
     StrictHostKeyChecking no
     UserKnownHostsFile /dev/null
     HostKeyAlgorithms +ssh-rsa
-    PubkeyAcceptedAlgorithms +ssh-rsa
diff --git a/restore.sh b/restore.sh
@@ -292,6 +292,12 @@ set_tool_paths() {
     idevicererestore+="$dir/idevicererestore"
     ipwnder+="$dir/ipwnder"
     irecovery2+="$dir/irecovery2"
+
+    cp ../resources/ssh_config .
+    if [[ $(ssh -V 2>&1 | grep -c SSH_8.8) == 1 || $(ssh -V 2>&1 | grep -c SSH_8.9) == 1 ||
+          $(ssh -V 2>&1 | grep -c SSH_9.) == 1 || $(ssh -V 2>&1 | grep -c SSH_10.) == 1 ]]; then
+        echo "    PubkeyAcceptedAlgorithms +ssh-rsa" >> ssh_config
+    fi
     scp2="scp -F ../resources/ssh_config"
     ssh2="ssh -F ../resources/ssh_config"
 }