force min versions for transative deps

.github/workflows/rust.yml

@@ -99,10 +99,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    # # Re-resolve Cargo.lock with minimal versions
-    # - uses: dtolnay/rust-toolchain@nightly
-    # - run: cargo update -Z minimal-versions
-
+    # Re-resolve Cargo.lock with minimal versions
+    - uses: dtolnay/rust-toolchain@nightly
+    - run: cargo update -Z minimal-versions
     # Now check that `cargo build` works with respect to the oldest possible
     # deps and the stated MSRV
     - uses: dtolnay/[email protected]

Cargo.toml

@@ -3,7 +3,7 @@
 
 members = [
     "crates/lyrebird",
-    "crates/o5",
+    # "crates/o5",
     "crates/o7",
     "crates/obfs4",
     "crates/ptrs",

crates/o5/Cargo.toml

@@ -13,7 +13,7 @@ rand = { version="0.8.5", features=["getrandom"]}
 rand_core = "0.6.4"
 
 subtle = "2.5.0"
-x25519-dalek = { version = "2", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
+x25519-dalek = { version = "2.0.1", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
 
 # ntor_arti
 zeroize = "1.7.0"

crates/o7/Cargo.toml

@@ -24,4 +24,4 @@ ptrs = { path="../ptrs", version="0.1.0" }
 
 ## Networking tools
 tokio = { version = "1.33", features = ["io-util", "rt-multi-thread", "net", "rt", "macros", "sync", "signal", "time", "fs"] }
-tokio-util = { version = "0.7.10", features = ["codec", "io", "net"]}
+# tokio-util = { version = "0.7.10", features = ["codec", "io", "net"]}

crates/obfs4/Cargo.toml

@@ -36,7 +36,7 @@ hmac = { version="0.12.1", features=["reset"]}
 hkdf = "0.12.3"
 crypto_secretbox = { version="0.1.1", features=["salsa20"]}
 subtle = "2.5.0"
-x25519-dalek = { version = "2", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
+x25519-dalek = { version = "2.0.1", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
 
 ## Utils
 hex = "0.4.3"
@@ -62,13 +62,13 @@ cipher = "0.4.4"
 zeroize = "1.7.0"
 thiserror = "1.0.56"
 
-# fwd
-fast-socks5 = "0.9.1"
-url = "2.5.0"
-anyhow = "1.0"
-tracing-subscriber = "0.3.18"
-clap = { version = "4.4", features = ["derive"]}
-safelog = { version = "0.3.5" }
+## transative dependencies that break things when versions are too low
+## i.e. any lower than the exact versions here.
+curve25519-dalek = { version="4.1.2", optional=true}
+anyhow = { version="1.0.20", optional=true}
+async-trait = { version="0.1.9", optional=true}
+num-bigint = { version="0.4.2", optional=true}
+simple_asn1 = { version="0.6.1", optional=true}
 
 ## Maybe useful in future iterations
 # tor-socksproto = { version = "0.10.0" }
@@ -83,3 +83,4 @@ tor-basic-utils = "0.18.0"
 # o5 pqc test
 # pqc_kyber = {version="0.7.1", features=["kyber1024", "std"]}
 # ml-kem = "0.1.0"
+