From 270b69b93c8f789b74ebfb902639cd5f4c9c17c9 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Wed, 9 Apr 2025 13:28:12 +0900 Subject: [PATCH 1/9] lock --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc39661..c7b3ae6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -406,9 +406,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.17" +version = "1.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a" +checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" dependencies = [ "jobserver", "libc", @@ -647,9 +647,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] @@ -726,9 +726,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" dependencies = [ "libc", "windows-sys 0.59.0", @@ -1382,9 +1382,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown", @@ -1580,9 +1580,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", ] @@ -1706,9 +1706,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openssl" -version = "0.10.71" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ "bitflags", "cfg-if", @@ -1738,18 +1738,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-src" -version = "300.4.2+3.4.1" +version = "300.5.0+3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2" +checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.106" +version = "0.9.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" +checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" dependencies = [ "cc", "libc", @@ -1847,9 +1847,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb" +checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" dependencies = [ "proc-macro2", "syn", @@ -2514,9 +2514,9 @@ dependencies = [ [[package]] name = "s2n-tls" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf1868fc9471aa5461c3b29c5e11011a5d3cbe36ce62d2a12d33d3681859b80" +checksum = "097f3b0be6362628aed46f8058004ae9e19315b04c1cdf7be3293a641942dcda" dependencies = [ "errno", "hex", @@ -2527,9 +2527,9 @@ dependencies = [ [[package]] name = "s2n-tls-sys" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f49b6ace3b4f332bc550f4ddbf1c1cd4250b10be223ec23a29e28db1e51f3fd" +checksum = "50567eb5d5cf444f4c5eef0968561aa2eceb2fbd8b29c83bc99c7a495c43a3ff" dependencies = [ "aws-lc-rs", "cc", @@ -2683,9 +2683,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" +checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "socket2" @@ -3507,9 +3507,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" +checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" dependencies = [ "memchr", ] From 09954719bfd293544ee59cb24a3009cb9e9ee711 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Thu, 10 Apr 2025 13:38:29 +0900 Subject: [PATCH 2/9] chore: deps s2n-quic --- Cargo.lock | 18 +++++++++--------- rpxy-lib/Cargo.toml | 6 +++--- submodules/s2n-quic | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7b3ae6..2cdcacf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2377,7 +2377,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "s2n-codec" -version = "0.56.0" +version = "0.57.0" dependencies = [ "byteorder", "bytes", @@ -2386,7 +2386,7 @@ dependencies = [ [[package]] name = "s2n-quic" -version = "1.56.0" +version = "1.57.0" dependencies = [ "bytes", "cfg-if", @@ -2409,7 +2409,7 @@ dependencies = [ [[package]] name = "s2n-quic-core" -version = "0.56.0" +version = "0.57.0" dependencies = [ "atomic-waker", "byteorder", @@ -2428,7 +2428,7 @@ dependencies = [ [[package]] name = "s2n-quic-crypto" -version = "0.56.0" +version = "0.57.0" dependencies = [ "aws-lc-rs", "cfg-if", @@ -2451,7 +2451,7 @@ dependencies = [ [[package]] name = "s2n-quic-platform" -version = "0.56.0" +version = "0.57.0" dependencies = [ "cfg-if", "futures", @@ -2464,7 +2464,7 @@ dependencies = [ [[package]] name = "s2n-quic-rustls" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "rustls", @@ -2477,7 +2477,7 @@ dependencies = [ [[package]] name = "s2n-quic-tls" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "errno", @@ -2490,7 +2490,7 @@ dependencies = [ [[package]] name = "s2n-quic-tls-default" -version = "0.56.0" +version = "0.57.0" dependencies = [ "s2n-quic-rustls", "s2n-quic-tls", @@ -2498,7 +2498,7 @@ dependencies = [ [[package]] name = "s2n-quic-transport" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "futures-channel", diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 20b3023..691abf4 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -94,11 +94,11 @@ tracing = { version = "0.1.41" } quinn = { version = "0.11.7", optional = true } h3 = { version = "0.0.7", features = ["tracing"], optional = true } h3-quinn = { version = "0.0.9", optional = true } -s2n-quic = { version = "1.56.0", path = "../submodules/s2n-quic/quic/s2n-quic/", default-features = false, features = [ +s2n-quic = { version = "1.57.0", path = "../submodules/s2n-quic/quic/s2n-quic/", default-features = false, features = [ "provider-tls-rustls", ], optional = true } -s2n-quic-core = { version = "0.56.0", path = "../submodules/s2n-quic/quic/s2n-quic-core", default-features = false, optional = true } -s2n-quic-rustls = { version = "0.56.0", path = "../submodules/s2n-quic/quic/s2n-quic-rustls", optional = true } +s2n-quic-core = { version = "0.57.0", path = "../submodules/s2n-quic/quic/s2n-quic-core", default-features = false, optional = true } +s2n-quic-rustls = { version = "0.57.0", path = "../submodules/s2n-quic/quic/s2n-quic-rustls", optional = true } s2n-quic-h3 = { path = "../submodules/s2n-quic/quic/s2n-quic-h3/", features = [ "tracing", ], optional = true } diff --git a/submodules/s2n-quic b/submodules/s2n-quic index 54250c9..3dd7d1f 160000 --- a/submodules/s2n-quic +++ b/submodules/s2n-quic @@ -1 +1 @@ -Subproject commit 54250c9b1af395594723f7e4a53cb00ccae3e3c7 +Subproject commit 3dd7d1ff0d311acd1c1abcc86fd9f428a90a0f78 From efade5aff9cf22a50b66288a347caf3d9fd0efa7 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Fri, 11 Apr 2025 15:27:23 +0900 Subject: [PATCH 3/9] chore: deps --- Cargo.lock | 10 +++++----- rpxy-acme/Cargo.toml | 2 +- rpxy-certs/Cargo.toml | 2 +- rpxy-lib/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2cdcacf..37eb1a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1514,9 +1514,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" @@ -2241,15 +2241,15 @@ dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys 0.9.3", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.25" +version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "aws-lc-rs", "log", diff --git a/rpxy-acme/Cargo.toml b/rpxy-acme/Cargo.toml index f08bace..82d3f5b 100644 --- a/rpxy-acme/Cargo.toml +++ b/rpxy-acme/Cargo.toml @@ -24,7 +24,7 @@ aws-lc-rs = { version = "1.13.0", default-features = false, features = [ "aws-lc-sys", ] } blocking = "1.6.1" -rustls = { version = "0.23.25", default-features = false, features = [ +rustls = { version = "0.23.26", default-features = false, features = [ "std", "aws_lc_rs", ] } diff --git a/rpxy-certs/Cargo.toml b/rpxy-certs/Cargo.toml index 92d4ed1..2bad8fc 100644 --- a/rpxy-certs/Cargo.toml +++ b/rpxy-certs/Cargo.toml @@ -22,7 +22,7 @@ derive_builder = { version = "0.20.2" } thiserror = { version = "2.0.12" } hot_reload = { version = "0.1.9" } async-trait = { version = "0.1.88" } -rustls = { version = "0.23.25", default-features = false, features = [ +rustls = { version = "0.23.26", default-features = false, features = [ "std", "aws_lc_rs", ] } diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 691abf4..a1c16d4 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -80,7 +80,7 @@ hyper-rustls = { version = "0.27.5", default-features = false, features = [ # tls and cert management for server rpxy-certs = { path = "../rpxy-certs/", default-features = false } hot_reload = "0.1.9" -rustls = { version = "0.23.25", default-features = false } +rustls = { version = "0.23.26", default-features = false } rustls-post-quantum = { version = "0.2.2", optional = true } tokio-rustls = { version = "0.26.2", features = ["early-data"] } From 463e8199fd292191951f42a3c25b5d6972f6094f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 22:06:07 +0000 Subject: [PATCH 4/9] chore(deps): bump clap from 4.5.35 to 4.5.36 Bumps [clap](https://github.com/clap-rs/clap) from 4.5.35 to 4.5.36. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.35...clap_complete-v4.5.36) --- updated-dependencies: - dependency-name: clap dependency-version: 4.5.36 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- rpxy-bin/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37eb1a4..4146172 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -468,18 +468,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" dependencies = [ "anstream", "anstyle", diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index ab15d8a..2c1eb21 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -47,7 +47,7 @@ async-trait = "0.1.88" futures-util = { version = "0.3.31", default-features = false } # config -clap = { version = "4.5.35", features = ["std", "cargo", "wrap_help"] } +clap = { version = "4.5.36", features = ["std", "cargo", "wrap_help"] } toml = { version = "0.8.20", default-features = false, features = ["parse"] } hot_reload = "0.1.9" serde_ignored = "0.1.11" From 9673eec3a35558e5dc06c742c77ec5cfdff330eb Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Mon, 14 Apr 2025 14:06:05 +0900 Subject: [PATCH 5/9] chore: deps --- Cargo.lock | 12 ++++++------ rpxy-bin/Cargo.toml | 2 +- rpxy-lib/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4146172..1b5b8f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.97" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "asn1-rs" @@ -406,9 +406,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.18" +version = "1.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" +checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" dependencies = [ "jobserver", "libc", @@ -627,9 +627,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "der-parser" diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 2c1eb21..28dd703 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -32,7 +32,7 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ # TODO: pin mimalloc due to compilation failure by musl mimalloc = { version = "=0.1.44", default-features = false } libmimalloc-sys = { version = "=0.1.40" } -anyhow = "1.0.97" +anyhow = "1.0.98" ahash = "0.8.11" serde = { version = "1.0.219", default-features = false, features = ["derive"] } tokio = { version = "1.44.2", default-features = false, features = [ diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index a1c16d4..1d4d5ab 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -54,7 +54,7 @@ pin-project-lite = "0.2.16" async-trait = "0.1.88" # Error handling -anyhow = "1.0.97" +anyhow = "1.0.98" thiserror = "2.0.12" # http for both server and client From 9170c05748d05d53b51b4a669503a34651318f0d Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Tue, 15 Apr 2025 13:20:50 +0900 Subject: [PATCH 6/9] chore: deps lru --- Cargo.lock | 12 ++++++------ rpxy-lib/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b5b8f9..4abf365 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -978,9 +978,9 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "h2" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" +checksum = "75249d144030531f8dee69fe9cea04d3edf809a017ae445e2abdff6629e86633" dependencies = [ "atomic-waker", "bytes", @@ -1476,9 +1476,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" @@ -1532,9 +1532,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lru" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" +checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198" dependencies = [ "hashbrown", ] diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 1d4d5ab..216a8e0 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -108,7 +108,7 @@ socket2 = { version = "0.5.9", features = ["all"], optional = true } # cache http-cache-semantics = { path = "../submodules/rusty-http-cache-semantics", default-features = false, optional = true } -lru = { version = "0.13.0", optional = true } +lru = { version = "0.14.0", optional = true } sha2 = { version = "0.10.8", default-features = false, optional = true } # cookie handling for sticky cookie From b91b0a2da237a3e918731aada452f83f5ca27aad Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Fri, 18 Apr 2025 12:19:05 +0900 Subject: [PATCH 7/9] chore: deps --- Cargo.lock | 15 +++++++-------- rpxy-lib/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4abf365..dc1b7a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1857,9 +1857,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -1899,7 +1899,7 @@ checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc" dependencies = [ "bytes", "getrandom 0.3.2", - "rand 0.9.0", + "rand 0.9.1", "ring", "rustc-hash 2.1.1", "rustls", @@ -1956,13 +1956,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.24", ] [[package]] @@ -2173,7 +2172,7 @@ dependencies = [ "lru", "pin-project-lite", "quinn", - "rand 0.9.0", + "rand 0.9.1", "rpxy-acme", "rpxy-certs", "rustls", @@ -2393,7 +2392,7 @@ dependencies = [ "cuckoofilter", "futures", "hash_hasher", - "rand 0.9.0", + "rand 0.9.1", "rand_chacha 0.9.0", "s2n-codec", "s2n-quic-core", diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 216a8e0..4c546ea 100644 --- a/rpxy-lib/Cargo.toml +++ b/rpxy-lib/Cargo.toml @@ -36,7 +36,7 @@ post-quantum = [ ] [dependencies] -rand = "0.9.0" +rand = "0.9.1" ahash = "0.8.11" bytes = "1.10.1" derive_builder = "0.20.2" From f1fc313cdab9c1c6bc3814036ab6cc1b833bc4de Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Sun, 20 Apr 2025 14:54:00 +0900 Subject: [PATCH 8/9] chore: deps --- Cargo.lock | 20 ++++++++++---------- rpxy-bin/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc1b7a9..dfc15fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f" +checksum = "0ddeb19ee86cb16ecfc871e5b0660aff6285760957aaedda6284cf0e790d3769" dependencies = [ "bindgen", "cc", @@ -468,18 +468,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", @@ -2513,9 +2513,9 @@ dependencies = [ [[package]] name = "s2n-tls" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "097f3b0be6362628aed46f8058004ae9e19315b04c1cdf7be3293a641942dcda" +checksum = "c2a05886fe90b529c7ffef6b8b5542e26e21e3b0e66612673395c7ecedde0e30" dependencies = [ "errno", "hex", @@ -2526,9 +2526,9 @@ dependencies = [ [[package]] name = "s2n-tls-sys" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50567eb5d5cf444f4c5eef0968561aa2eceb2fbd8b29c83bc99c7a495c43a3ff" +checksum = "c69b480e275a5c3016307c589f2f71bbf9ea21c102e7ce3c19316d908bf0c21f" dependencies = [ "aws-lc-rs", "cc", diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index 28dd703..ded16e2 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -47,7 +47,7 @@ async-trait = "0.1.88" futures-util = { version = "0.3.31", default-features = false } # config -clap = { version = "4.5.36", features = ["std", "cargo", "wrap_help"] } +clap = { version = "4.5.37", features = ["std", "cargo", "wrap_help"] } toml = { version = "0.8.20", default-features = false, features = ["parse"] } hot_reload = "0.1.9" serde_ignored = "0.1.11" From 42630d3b53f66adf5083377db292f54621be34b1 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Wed, 23 Apr 2025 17:23:57 +0900 Subject: [PATCH 9/9] refactor --- rpxy-certs/src/certs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpxy-certs/src/certs.rs b/rpxy-certs/src/certs.rs index 1e8802a..18927a2 100644 --- a/rpxy-certs/src/certs.rs +++ b/rpxy-certs/src/certs.rs @@ -65,7 +65,7 @@ impl SingleServerCertsKeys { .cert_keys .clone() .iter() - .find_map(|k| if let Ok(sk) = any_supported_type(k) { Some(sk) } else { None }) + .find_map(|k| any_supported_type(k).ok()) .ok_or_else(|| RpxyCertError::InvalidCertificateAndKey)?; let cert = self.certs.iter().map(|c| Certificate::from(c.to_vec())).collect::>();