move

2026-01-14 16:35:06 +01:00 · 2024-08-22 21:21:26 +02:00 · 2024-08-22 21:21:26 +02:00 · de8f5dde21
commit de8f5dde21
parent 7ac2ef4194
34 changed files with 10 additions and 15 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,12 +1,7 @@
 [workspace]
 members = [
-    "fakesshd",
-    "ssh",
-    "sshdos",
-    "ssh-connection",
-    "ssh-protocol",
-    "ssh-transport",
-    "ssh-agent-client", "ssh-agentctl",
+    "lib/*",
+    "bin/*"
 ]
 resolver = "2"

--- a/bin/fakesshd/Cargo.toml
+++ b/bin/fakesshd/Cargo.toml
@ -7,7 +7,7 @@ edition = "2021"
 eyre = "0.6.12"
 hex-literal = "0.4.1"
 rand = "0.8.5"
-ssh-protocol = { path = "../ssh-protocol" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }

 tokio = { version = "1.39.2", features = ["full"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
--- a/bin/fakesshd/README.md
+++ b/bin/fakesshd/README.md
--- a/bin/fakesshd/smoke-test.sh
+++ b/bin/fakesshd/smoke-test.sh
--- a/bin/fakesshd/src/main.rs
+++ b/bin/fakesshd/src/main.rs
--- a/bin/ssh-agentctl/Cargo.toml
+++ b/bin/ssh-agentctl/Cargo.toml
@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-ssh-agent-client = { path = "../ssh-agent-client" } 
-ssh-transport = { path = "../ssh-transport" } 
+ssh-agent-client = { path = "../../lib/ssh-agent-client" } 
+ssh-transport = { path = "../../lib/ssh-transport" } 

 clap = { version = "4.5.16", features = ["derive"] }
 eyre = "0.6.12"
--- a/bin/ssh-agentctl/src/main.rs
+++ b/bin/ssh-agentctl/src/main.rs
--- a/bin/ssh/Cargo.toml
+++ b/bin/ssh/Cargo.toml
@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-ssh-protocol = { path = "../ssh-protocol" }
-ssh-transport = { path = "../ssh-transport" }
-ssh-agent-client = { path = "../ssh-agent-client" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }
+ssh-transport = { path = "../../lib/ssh-transport" }
+ssh-agent-client = { path = "../../lib/ssh-agent-client" }

 clap = { version = "4.5.15", features = ["derive"] }
 eyre = "0.6.12"
--- a/bin/ssh/README.md
+++ b/bin/ssh/README.md
--- a/bin/ssh/src/main.rs
+++ b/bin/ssh/src/main.rs
--- a/bin/sshdos/Cargo.toml
+++ b/bin/sshdos/Cargo.toml
@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-ssh-protocol = { path = "../ssh-protocol" }
-ssh-transport = { path = "../ssh-transport" }
+ssh-protocol = { path = "../../lib/ssh-protocol" }
+ssh-transport = { path = "../../lib/ssh-transport" }
 clap = { version = "4.5.15", features = ["derive"] }
 eyre = "0.6.12"
 rand = "0.8.5"
--- a/bin/sshdos/README.md
+++ b/bin/sshdos/README.md
--- a/bin/sshdos/src/main.rs
+++ b/bin/sshdos/src/main.rs
--- a/lib/ssh-agent-client/Cargo.toml
+++ b/lib/ssh-agent-client/Cargo.toml
--- a/lib/ssh-agent-client/README.md
+++ b/lib/ssh-agent-client/README.md
--- a/lib/ssh-agent-client/src/lib.rs
+++ b/lib/ssh-agent-client/src/lib.rs
--- a/lib/ssh-connection/Cargo.toml
+++ b/lib/ssh-connection/Cargo.toml
--- a/lib/ssh-connection/README.md
+++ b/lib/ssh-connection/README.md
--- a/lib/ssh-connection/src/lib.rs
+++ b/lib/ssh-connection/src/lib.rs
--- a/lib/ssh-protocol/Cargo.toml
+++ b/lib/ssh-protocol/Cargo.toml
--- a/lib/ssh-protocol/README.md
+++ b/lib/ssh-protocol/README.md
--- a/lib/ssh-protocol/src/lib.rs
+++ b/lib/ssh-protocol/src/lib.rs
--- a/lib/ssh-transport/Cargo.toml
+++ b/lib/ssh-transport/Cargo.toml
--- a/lib/ssh-transport/README.md
+++ b/lib/ssh-transport/README.md
--- a/lib/ssh-transport/src/client.rs
+++ b/lib/ssh-transport/src/client.rs
--- a/lib/ssh-transport/src/crypto.rs
+++ b/lib/ssh-transport/src/crypto.rs
--- a/lib/ssh-transport/src/crypto/encrypt.rs
+++ b/lib/ssh-transport/src/crypto/encrypt.rs
--- a/lib/ssh-transport/src/key.rs
+++ b/lib/ssh-transport/src/key.rs
--- a/lib/ssh-transport/src/lib.rs
+++ b/lib/ssh-transport/src/lib.rs
--- a/lib/ssh-transport/src/numbers.rs
+++ b/lib/ssh-transport/src/numbers.rs
--- a/lib/ssh-transport/src/packet.rs
+++ b/lib/ssh-transport/src/packet.rs
--- a/lib/ssh-transport/src/packet/ctors.rs
+++ b/lib/ssh-transport/src/packet/ctors.rs
--- a/lib/ssh-transport/src/parse.rs
+++ b/lib/ssh-transport/src/parse.rs
--- a/lib/ssh-transport/src/server.rs
+++ b/lib/ssh-transport/src/server.rs