supports legacy hmac and kex

webosbrew · Sep 14, 2023 · ec70c3e · ec70c3e
1 parent f6fbdd8
commit ec70c3e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,4 +7,8 @@ members = [
     "ares-push",
     "ares-launch",
     "ares-device",
-]
+]
+
+[patch.crates-io]
+libssh-rs = { git = "https://github.com/mariotaku/libssh-rs.git", branch = "feature/more-auth-options" }
+libssh-rs-sys = { git = "https://github.com/mariotaku/libssh-rs.git", branch = "feature/more-auth-options" }
diff --git a/ares-device/Cargo.toml b/ares-device/Cargo.toml
@@ -27,4 +27,4 @@ gtk = "0.17.1"
 embed-manifest = "1.3.1"
 
 [package.metadata.deb]
-section = "devel"
+section = "devel"
diff --git a/common/connection/src/session.rs b/common/connection/src/session.rs
@@ -19,13 +19,47 @@ pub enum SessionError {
 
 impl NewSession for Device {
     fn new_session(&self) -> Result<Session, SessionError> {
+        let kex = vec![
+            "curve25519-sha256",
+            "[email protected]",
+            "ecdh-sha2-nistp256",
+            "ecdh-sha2-nistp384",
+            "ecdh-sha2-nistp521",
+            "diffie-hellman-group18-sha512",
+            "diffie-hellman-group16-sha512",
+            "diffie-hellman-group-exchange-sha256",
+            "diffie-hellman-group14-sha256",
+            "diffie-hellman-group1-sha1",
+            "diffie-hellman-group14-sha1",
+        ];
+        let hmac = vec![
+            "[email protected]",
+            "[email protected]",
+            "hmac-sha2-256",
+            "hmac-sha2-512",
+            "hmac-sha1-96",
+            "hmac-sha1",
+            "hmac-md5",
+        ];
+        let key_types = vec![
+            "ssh-ed25519",
+            "ecdsa-sha2-nistp521",
+            "ecdsa-sha2-nistp384",
+            "ecdsa-sha2-nistp256",
+            "rsa-sha2-512",
+            "rsa-sha2-256",
+            "ssh-rsa",
+        ];
         let session = Session::new()?;
         session.set_option(SshOption::Timeout(Duration::from_secs(10)))?;
         session.set_option(SshOption::Hostname(self.host.clone()))?;
         session.set_option(SshOption::Port(self.port.clone()))?;
         session.set_option(SshOption::User(Some(self.username.clone())))?;
-        session.set_option(SshOption::HostKeys(format!("ssh-ed25519,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,rsa-sha2-512,rsa-sha2-256,ssh-rsa")))?;
-        session.set_option(SshOption::PublicKeyAcceptedTypes(format!("ssh-ed25519,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,rsa-sha2-512,rsa-sha2-256,ssh-rsa")))?;
+        session.set_option(SshOption::KeyExchange(kex.join(",")))?;
+        session.set_option(SshOption::HmacCS(hmac.join(",")))?;
+        session.set_option(SshOption::HmacSC(hmac.join(",")))?;
+        session.set_option(SshOption::HostKeys(key_types.join(",")))?;
+        session.set_option(SshOption::PublicKeyAcceptedTypes(key_types.join(",")))?;
         session.set_option(SshOption::ProcessConfig(false))?;
         #[cfg(windows)]
         {