Skip to content

Commit 973dee5

Browse files
committed
only send enabled key algos in server-sig-algs
1 parent 240833a commit 973dee5

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

russh/src/server/session.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::collections::HashMap;
22
use std::sync::Arc;
33

4+
use log::debug;
45
use russh_keys::encoding::{Encoding, Reader};
56
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
67
use tokio::sync::mpsc::{unbounded_channel, Receiver, Sender, UnboundedReceiver, UnboundedSender};
7-
use log::debug;
88

99
use super::*;
1010
use crate::channels::{Channel, ChannelMsg};
@@ -884,7 +884,8 @@ impl Session {
884884
key_extension_client = super::negotiation::Server::select(
885885
&[EXTENSION_SUPPORT_AS_CLIENT],
886886
kex_string,
887-
).is_some();
887+
)
888+
.is_some();
888889
}
889890
}
890891

@@ -897,12 +898,8 @@ impl Session {
897898
enc.write.push(msg::EXT_INFO);
898899
enc.write.push_u32_be(1);
899900
enc.write.extend_ssh_string(b"server-sig-algs");
900-
if cfg!(feature = "openssl") {
901-
enc.write
902-
.extend_ssh_string(b"ssh-rsa,ssh-ed25519,rsa-sha2-256,rsa-sha2-512");
903-
} else {
904-
enc.write.extend_ssh_string(b"ssh-ed25519");
905-
}
901+
enc.write
902+
.extend_list(self.common.config.preferred.key.iter());
906903
});
907904
}
908905
}

0 commit comments

Comments
 (0)