From 9a12aa72a0c99542c130c669e918fbbb7566bb2c Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Fri, 3 Jul 2026 11:29:00 +0800 Subject: [PATCH] fix deps --- Cargo.lock | 65 ------------------------------ Cargo.toml | 2 +- README.md | 2 +- config.toml.example => config.toml | 4 +- src/tls.rs | 2 +- 5 files changed, 5 insertions(+), 70 deletions(-) rename config.toml.example => config.toml (73%) diff --git a/Cargo.lock b/Cargo.lock index e90566d..8d46be3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,29 +62,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "aws-lc-rs" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", - "pkg-config", -] - [[package]] name = "base64" version = "0.22.1" @@ -125,8 +102,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" dependencies = [ "find-msvc-tools", - "jobserver", - "libc", "shlex", ] @@ -148,15 +123,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cmake" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" -dependencies = [ - "cc", -] - [[package]] name = "combine" version = "4.6.7" @@ -220,12 +186,6 @@ dependencies = [ "syn", ] -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "equivalent" version = "1.0.2" @@ -260,12 +220,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures-core" version = "0.3.32" @@ -377,16 +331,6 @@ dependencies = [ "syn", ] -[[package]] -name = "jobserver" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" -dependencies = [ - "getrandom 0.3.4", - "libc", -] - [[package]] name = "js-sys" version = "0.3.103" @@ -582,12 +526,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkg-config" -version = "0.3.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" - [[package]] name = "powerfmt" version = "0.2.0" @@ -804,8 +742,6 @@ version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ - "aws-lc-rs", - "log", "once_cell", "ring", "rustls-pki-types", @@ -878,7 +814,6 @@ version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", diff --git a/Cargo.toml b/Cargo.toml index e9a82c2..26d6f8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" anyhow = "1" quinn = { version = "0.11", default-features = true, features = ["runtime-tokio", "rustls"] } rcgen = "0.14.8" -rustls = "0.23" +rustls = { version = "0.23", default-features = false, features = ["ring", "std"] } rustls-pemfile = "2" serde = { version = "1", features = ["derive"] } tokio = { version = "1", features = ["full"] } diff --git a/README.md b/README.md index 048a2ee..711cd70 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ header encryption is intentionally not present. ## Run ```sh -cargo run -- config.toml.example +cargo run -- config.toml ``` The server also reads the config path from `RELAY_SERVER_CONFIG`. If neither is diff --git a/config.toml.example b/config.toml similarity index 73% rename from config.toml.example rename to config.toml index ef451f8..c774935 100644 --- a/config.toml.example +++ b/config.toml @@ -10,5 +10,5 @@ password = "v7@Qm!2z#R8$pL4^xT?K" [tls] # Leave both paths unset for a generated development certificate. self_signed = true -# cert_path = "certs/server.crt" -# key_path = "certs/server.key" +cert_path = "/usr/local/code/certs/server.crt" +key_path = "/usr/local/code/certs/server.key" diff --git a/src/tls.rs b/src/tls.rs index fe1b096..3868643 100644 --- a/src/tls.rs +++ b/src/tls.rs @@ -56,7 +56,7 @@ fn generate_self_signed() -> anyhow::Result<(Vec>, Priva { let certified = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()])?; let cert = certified.cert.der().clone(); - let key = PrivatePkcs8KeyDer::from(certified.key_pair.serialize_der()).into(); + let key = PrivatePkcs8KeyDer::from(certified.signing_key.serialize_der()).into(); Ok((vec![cert], key)) }