fixes

Eugeny · Jan 5, 2025 · d5daabd · d5daabd
1 parent 7aee69d
commit d5daabd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/russh/src/cert.rs b/russh/src/cert.rs
@@ -1,10 +1,10 @@
-use core::str;
-
-use russh_keys::helpers::AlgorithmExt;
 use russh_keys::key::PrivateKeyWithHashAlg;
-use ssh_encoding::Decode;
-use ssh_key::public::KeyData;
-use ssh_key::{Algorithm, Certificate, HashAlg, PublicKey};
+use ssh_key::{Certificate, HashAlg, PublicKey};
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    russh_keys::helpers::AlgorithmExt, ssh_encoding::Decode, ssh_key::public::KeyData,
+    ssh_key::Algorithm,
+};
 
 #[derive(Debug)]
 pub(crate) enum PublicKeyOrCertificate {
@@ -25,6 +25,7 @@ impl From<&PrivateKeyWithHashAlg> for PublicKeyOrCertificate {
 }
 
 impl PublicKeyOrCertificate {
+    #[cfg(not(target_arch = "wasm32"))]
     pub fn decode(pubkey_algo: &str, buf: &[u8]) -> Result<Self, ssh_key::Error> {
         let mut reader = buf;
         match Algorithm::new_certificate_ext(pubkey_algo) {

diff --git a/russh/src/client/mod.rs b/russh/src/client/mod.rs
@@ -39,7 +39,6 @@ use std::convert::TryInto;
 use std::num::Wrapping;
 use std::pin::Pin;
 use std::sync::Arc;
-use std::time::Instant;
 
 use async_trait::async_trait;
 use futures::task::{Context, Poll};
@@ -48,6 +47,7 @@ use kex::ClientKex;
 use log::{debug, error, trace};
 use russh_keys::key::PrivateKeyWithHashAlg;
 use russh_keys::map_err;
+use russh_util::time::Instant;
 use ssh_encoding::Decode;
 use ssh_key::{Certificate, PrivateKey, PublicKey};
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, ReadHalf, WriteHalf};

diff --git a/russh/src/msg.rs b/russh/src/msg.rs
@@ -25,6 +25,7 @@ pub const UNIMPLEMENTED: u8 = 3;
 #[allow(dead_code)]
 pub const DEBUG: u8 = 4;
 
+pub const SERVICE_REQUEST: u8 = 5;
 pub const SERVICE_ACCEPT: u8 = 6;
 pub const EXT_INFO: u8 = 7;
 pub const KEXINIT: u8 = 20;
@@ -73,7 +74,6 @@ mod server {
     // https://tools.ietf.org/html/rfc4256#section-5
     pub const USERAUTH_INFO_REQUEST: u8 = 60;
     pub const USERAUTH_PK_OK: u8 = 60;
-    pub const SERVICE_REQUEST: u8 = 5;
     pub const SSH_OPEN_ADMINISTRATIVELY_PROHIBITED: u8 = 1;
 }
 

diff --git a/russh/src/negotiation.rs b/russh/src/negotiation.rs
@@ -36,6 +36,7 @@ pub struct Config {
 #[derive(Debug, Clone)]
 pub struct Names {
     pub kex: kex::Name,
+    #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
     pub key: Algorithm,
     pub cipher: cipher::Name,
     pub client_mac: mac::Name,

diff --git a/russh/src/server/mod.rs b/russh/src/server/mod.rs
@@ -34,7 +34,6 @@ use std::num::Wrapping;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
-use std::time::Instant;
 
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -43,6 +42,7 @@ use log::{debug, error, info, warn};
 use msg::is_kex_msg;
 use russh_keys::map_err;
 use russh_util::runtime::JoinHandle;
+use russh_util::time::Instant;
 use ssh_key::{Certificate, PrivateKey};
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 use tokio::net::{TcpListener, ToSocketAddrs};