From 4695149868ce02f02a621fd87a16b45961cf4e93 Mon Sep 17 00:00:00 2001
From: Eugene <inbox@null.page>
Date: Tue, 14 Jan 2025 17:33:57 +0100
Subject: [PATCH] cleanup

---
 russh-keys/Cargo.toml | 34 ----------------------------------
 russh/Cargo.toml      | 17 ++++++++++++++---
 russh/src/lib.rs      |  5 +----
 3 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 russh-keys/Cargo.toml

diff --git a/russh-keys/Cargo.toml b/russh-keys/Cargo.toml
deleted file mode 100644
index 3587f38a..00000000
--- a/russh-keys/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-authors = ["Pierre-Étienne Meunier <pe@pijul.org>"]
-description = "Deal with SSH keys: load them, decrypt them, call an SSH agent."
-documentation = "https://docs.rs/russh-keys"
-edition = "2021"
-homepage = "https://github.com/warp-tech/russh"
-keywords = ["ssh"]
-license = "Apache-2.0"
-name = "russh-keys"
-repository = "https://github.com/warp-tech/russh"
-version = "0.50.0-beta.7"
-rust-version = "1.65"
-
-[dependencies]
-
-[features]
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { workspace = true, features = [
-  "io-util",
-  "rt-multi-thread",
-  "time",
-  "net",
-] }
-tokio-stream.workspace = true
-home.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-pageant = { version = "0.0.2", path = "../pageant" }
-
-[dev-dependencies]
-env_logger.workspace = true
-tempfile = "3.14.0"
-tokio = { workspace = true, features = ["test-util", "macros", "process"] }
diff --git a/russh/Cargo.toml b/russh/Cargo.toml
index 040e1e21..2909c29a 100644
--- a/russh/Cargo.toml
+++ b/russh/Cargo.toml
@@ -45,7 +45,6 @@ generic-array = "0.14"
 getrandom = { version = "0.2.15", features = ["js"] }
 hex-literal = "0.4"
 hmac.workspace = true
-home.workspace = true
 inout = { version = "0.1", features = ["std"] }
 log.workspace = true
 md5 = "0.7"
@@ -76,7 +75,7 @@ ssh-encoding.workspace = true
 ssh-key.workspace = true
 subtle = "2.4"
 thiserror.workspace = true
-tokio = { workspace = true, features = ["io-util", "sync", "time", "net"] }
+tokio = { workspace = true, features = ["io-util", "sync", "time"] }
 typenum = "1.17"
 yasna = { version = "0.5.0", features = [
     "bit-vec",
@@ -84,6 +83,19 @@ yasna = { version = "0.5.0", features = [
 ], optional = true }
 zeroize = "1.7"
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+tokio = { workspace = true, features = [
+  "io-util",
+  "rt-multi-thread",
+  "time",
+  "net",
+] }
+tokio-stream.workspace = true
+home.workspace = true
+
+[target.'cfg(windows)'.dependencies]
+pageant = { version = "0.0.2", path = "../pageant" }
+
 [dev-dependencies]
 anyhow = "1.0.4"
 env_logger.workspace = true
@@ -103,7 +115,6 @@ tokio-fd = "0.3"
 termion = "2"
 ratatui = "0.29.0"
 tempfile = "3.14.0"
-tokio-stream.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 russh-sftp = "2.0.5"
diff --git a/russh/src/lib.rs b/russh/src/lib.rs
index 8a65e0f0..778c6b48 100644
--- a/russh/src/lib.rs
+++ b/russh/src/lib.rs
@@ -60,10 +60,7 @@
 //! # Design principles
 //!
 //! The main goal of this library is conciseness, and reduced size and
-//! readability of the library's code. Moreover, this library is split
-//! between Russh, which implements the main logic of SSH clients
-//! and servers, and Russh-keys, which implements calls to
-//! cryptographic primitives.
+//! readability of the library's code.
 //!
 //! One non-goal is to implement all possible cryptographic algorithms
 //! published since the initial release of SSH. Technical debt is