diff --git a/Cargo.lock b/Cargo.lock index 5038da5..8b60999 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", ] @@ -2376,7 +2376,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "s2n-codec" -version = "0.56.0" +version = "0.57.0" dependencies = [ "byteorder", "bytes", @@ -2385,7 +2385,7 @@ dependencies = [ [[package]] name = "s2n-quic" -version = "1.56.0" +version = "1.57.0" dependencies = [ "bytes", "cfg-if", @@ -2408,7 +2408,7 @@ dependencies = [ [[package]] name = "s2n-quic-core" -version = "0.56.0" +version = "0.57.0" dependencies = [ "atomic-waker", "byteorder", @@ -2427,7 +2427,7 @@ dependencies = [ [[package]] name = "s2n-quic-crypto" -version = "0.56.0" +version = "0.57.0" dependencies = [ "aws-lc-rs", "cfg-if", @@ -2450,7 +2450,7 @@ dependencies = [ [[package]] name = "s2n-quic-platform" -version = "0.56.0" +version = "0.57.0" dependencies = [ "cfg-if", "futures", @@ -2463,7 +2463,7 @@ dependencies = [ [[package]] name = "s2n-quic-rustls" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "rustls", @@ -2476,7 +2476,7 @@ dependencies = [ [[package]] name = "s2n-quic-tls" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "errno", @@ -2489,7 +2489,7 @@ dependencies = [ [[package]] name = "s2n-quic-tls-default" -version = "0.56.0" +version = "0.57.0" dependencies = [ "s2n-quic-rustls", "s2n-quic-tls", @@ -2497,7 +2497,7 @@ dependencies = [ [[package]] name = "s2n-quic-transport" -version = "0.56.0" +version = "0.57.0" dependencies = [ "bytes", "futures-channel", 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::>(); diff --git a/rpxy-lib/Cargo.toml b/rpxy-lib/Cargo.toml index 20cf272..cfd22b7 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 } @@ -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 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