bumped russh: RSA-SHA1 support - fixes #139

warp-tech · Jun 18, 2022 · 28ed510 · 28ed510
1 parent aa1c5f8
commit 28ed510
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
@@ -14,7 +14,7 @@ hex = "0.4"
 mime_guess = {version = "2.0", default_features = false}
 poem = {version = "^1.3.24", features = ["cookie", "session", "anyhow", "rustls", "websocket", "embed"]}
 poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]}
-russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]}
+russh-keys = {version = "0.22.0-beta.2", features = ["openssl"]}
 rust-embed = "6.3"
 sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
 serde = "1.0"

diff --git a/warpgate-protocol-ssh/Cargo.toml b/warpgate-protocol-ssh/Cargo.toml
@@ -12,8 +12,8 @@ bimap = "0.6"
 bytes = "1.1"
 dialoguer = "0.10"
 futures = "0.3"
-russh = {version = "0.34.0-beta.4", features = ["openssl"]}
-russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]}
+russh = {version = "0.34.0-beta.5", features = ["openssl"]}
+russh-keys = {version = "0.22.0-beta.2", features = ["openssl"]}
 sea-orm = {version = "^0.8", features = ["runtime-tokio-native-tls"], default-features = false}
 thiserror = "1.0"
 time = "0.3"

diff --git a/warpgate-protocol-ssh/src/client/mod.rs b/warpgate-protocol-ssh/src/client/mod.rs
@@ -13,8 +13,8 @@ use channel_session::SessionChannel;
 use futures::pin_mut;
 use handler::ClientHandler;
 use russh::client::Handle;
-use russh::Sig;
-use russh_keys::key::PublicKey;
+use russh::{Sig, Preferred};
+use russh_keys::key::{PublicKey, self};
 use std::collections::HashMap;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
@@ -327,6 +327,10 @@ impl RemoteClient {
 
         info!(?address, username = &ssh_options.username[..], "Connecting");
         let config = russh::client::Config {
+            preferred: Preferred {
+                key: &[key::ED25519, key::RSA_SHA2_256, key::RSA_SHA2_512, key::SSH_RSA],
+                ..<_>::default()
+            },
             ..Default::default()
         };
         let config = Arc::new(config);