diff --git a/Cargo.lock b/Cargo.lock index 27e1d0f9..cf2882f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,6 +494,7 @@ dependencies = [ "ed25519-dalek", "elliptic-curve 0.14.0-rc.31", "enum_dispatch", + "env_logger", "flate2", "futures", "generic-array 1.4.1", @@ -528,6 +529,7 @@ dependencies = [ "spki 0.8.0", "ssh-encoding", "subtle", + "tempfile", "thiserror 2.0.18", "tokio", "typenum", @@ -1482,6 +1484,29 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "env_filter" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -2350,6 +2375,30 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jiff" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -3352,6 +3401,15 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +[[package]] +name = "portable-atomic-util" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +dependencies = [ + "portable-atomic", +] + [[package]] name = "potential_utf" version = "0.1.5" diff --git a/crates/bssh-russh/Cargo.toml b/crates/bssh-russh/Cargo.toml index cf5c9bda..9e72a202 100644 --- a/crates/bssh-russh/Cargo.toml +++ b/crates/bssh-russh/Cargo.toml @@ -101,3 +101,13 @@ ssh-key = { version = "=0.6.18", features = [ "ppk", "hazmat-allow-insecure-rsa-keys", ], package = "internal-russh-forked-ssh-key" } + +[dev-dependencies] +# Dev-deps required by the inline test modules imported from upstream russh +# (src/client/test.rs, src/keys/mod.rs, src/tests.rs). Without these, the fork's +# test target never compiles. +env_logger = "0.11" +tempfile = "3" +# Additive: merges with the main tokio dep to add the `process` and `macros` +# features needed by the spawn-ssh-agent helpers and #[tokio::test]. +tokio = { version = "1.52.1", features = ["process", "macros"] }