fixed #477 - send ssh-rsa hostkey in addition to rsa-sha* - fixes iOS…

… Termius support
warp-tech · Nov 17, 2022 · 9714570 · 9714570
1 parent 2040e92
commit 9714570
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
@@ -24,7 +24,8 @@ poem-openapi = { version = "2.0.19", features = [
     "uuid",
     "static-files",
 ] }
-russh-keys = { version = "0.22.0", features = ["openssl"] }
+russh-keys = { version = "0.23.0-beta.1", features = ["openssl"] }
+# russh-keys = { version = "0.23.0-beta.1", features = ["openssl"], path = "../../russh/russh-keys" }
 rust-embed = "6.3"
 sea-orm = { version = "0.10.2", features = [
     "runtime-tokio-native-tls",

diff --git a/warpgate-protocol-ssh/Cargo.toml b/warpgate-protocol-ssh/Cargo.toml
@@ -12,8 +12,10 @@ bimap = "0.6"
 bytes = "1.2"
 dialoguer = "0.10"
 futures = "0.3"
-russh = { version = "0.35.0-beta.2", features = ["vendored-openssl"] }
-russh-keys = { version = "0.22.0", features = ["vendored-openssl"] }
+russh = { version = "0.35.0-beta.3", features = ["vendored-openssl"] }
+# russh = { version = "0.35.0-beta.3", features = ["vendored-openssl"], path = "../../russh/russh"}
+russh-keys = { version = "0.23.0-beta.1", features = ["vendored-openssl"] }
+# russh-keys = { version = "0.23.0-beta.1", features = ["vendored-openssl"], path = "../../russh/russh-keys" }
 sea-orm = { version = "0.10.2", features = [
     "runtime-tokio-native-tls",
 ], default-features = false }

diff --git a/warpgate-protocol-ssh/src/keys.rs b/warpgate-protocol-ssh/src/keys.rs
@@ -49,7 +49,10 @@ pub fn load_host_keys(config: &WarpgateConfig) -> Result<Vec<KeyPair>, russh_key
     keys.push(load_secret_key(key_path, None)?);
 
     let key_path = path.join("host-rsa");
-    keys.push(load_secret_key(key_path, None)?);
+    let key = load_secret_key(key_path, None)?;
+    key.with_signature_hash(SignatureHash::SHA2_512).map(|key| keys.push(key));
+    key.with_signature_hash(SignatureHash::SHA2_256).map(|key| keys.push(key));
+    key.with_signature_hash(SignatureHash::SHA1).map(|key| keys.push(key));
 
     Ok(keys)
 }