From f1520c79b05eb078b7ef35e746aef853be7ad009 Mon Sep 17 00:00:00 2001
From: fpfeifferik <138105063+fpfeifferik@users.noreply.github.com>
Date: Thu, 28 Aug 2025 15:21:24 +0200
Subject: [PATCH] fix: ssh server doesnt offer ed-25519 hostkey (#1473)

---
 warpgate-protocol-ssh/src/keys.rs       | 5 +++--
 warpgate-protocol-ssh/src/server/mod.rs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/warpgate-protocol-ssh/src/keys.rs b/warpgate-protocol-ssh/src/keys.rs
index ff8ee7de..39e98175 100644
--- a/warpgate-protocol-ssh/src/keys.rs
+++ b/warpgate-protocol-ssh/src/keys.rs
@@ -47,7 +47,7 @@ pub fn generate_host_keys(config: &WarpgateConfig) -> Result<()> {
     Ok(())
 }
 
-pub fn load_host_keys(config: &WarpgateConfig) -> Result<PrivateKey, russh::keys::Error> {
+pub fn load_host_keys(config: &WarpgateConfig) -> Result<Vec<PrivateKey>, russh::keys::Error> {
     let path = get_keys_path(config);
     let mut keys = Vec::new();
 
@@ -55,8 +55,9 @@ pub fn load_host_keys(config: &WarpgateConfig) -> Result<PrivateKey, russh::keys
     keys.push(load_secret_key(key_path, None)?);
 
     let key_path = path.join("host-rsa");
+    keys.push(load_secret_key(key_path, None)?);
 
-    load_secret_key(key_path, None)
+    Ok(keys)
 }
 
 pub fn generate_client_keys(config: &WarpgateConfig) -> Result<()> {
diff --git a/warpgate-protocol-ssh/src/server/mod.rs b/warpgate-protocol-ssh/src/server/mod.rs
index 70886719..f8049da6 100644
--- a/warpgate-protocol-ssh/src/server/mod.rs
+++ b/warpgate-protocol-ssh/src/server/mod.rs
@@ -37,7 +37,7 @@ pub async fn run_server(services: Services, address: ListenEndpoint) -> Result<(
                     MethodKind::KeyboardInteractive,
                 ][..],
             ),
-            keys: vec![load_host_keys(&config)?],
+            keys: load_host_keys(&config)?,
             event_buffer_size: 100,
             nodelay: true,
             preferred: Preferred {