fixed #716 - ensure dynamic AgentClient refs are generally Send

Author: Eugeny

russh/Cargo.toml

@@ -134,8 +134,6 @@ tokio = { workspace = true, features = [
 ] }
 rand.workspace = true
 shell-escape = "0.1"
-tokio-fd = "0.3"
-termion = "4"
 ratatui = "0.30"
 tempfile = "3.14.0"
 
@@ -144,6 +142,10 @@ russh-sftp = "2.1.0"
 tokio.workspace = true
 tokio-stream.workspace = true
 
+[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
+tokio-fd = "0.3"
+termion = "4"
+
 [package.metadata.docs.rs]
 all-features = true
 

russh/src/auth.rs

@@ -173,7 +173,7 @@ pub enum AgentAuthError {
 }
 
 #[cfg_attr(feature = "async-trait", async_trait::async_trait)]
-impl<R: AsyncRead + AsyncWrite + Unpin + Send + 'static> Signer
+impl<R: AsyncRead + AsyncWrite + Unpin + Send> Signer
     for crate::keys::agent::client::AgentClient<R>
 {
     type Error = AgentAuthError;

russh/src/keys/agent/client.rs

@@ -25,17 +25,23 @@ pub struct AgentClient<S: AgentStream> {
     buf: Vec<u8>,
 }
 
-impl<S: AgentStream + Send + Unpin + 'static> AgentClient<S> {
+impl<S: AgentStream + Send + Unpin> AgentClient<S> {
     /// Wraps the internal stream in a Box<dyn _>, allowing different client
     /// implementations to have the same type
-    pub fn dynamic(self) -> AgentClient<Box<dyn AgentStream + Send + Unpin + 'static>> {
+    pub fn dynamic<'a>(self) -> AgentClient<Box<dyn AgentStream + Send + Unpin + 'a>>
+    where
+        S: 'a,
+    {
         AgentClient {
             stream: Box::new(self.stream),
             buf: self.buf,
         }
     }
 
-    pub fn into_inner(self) -> Box<dyn AgentStream + Send + Unpin + 'static> {
+    pub fn into_inner<'a>(self) -> Box<dyn AgentStream + Send + Unpin + 'a>
+    where
+        S: 'a,
+    {
         Box::new(self.stream)
     }
 }