diff --git a/Cargo.lock b/Cargo.lock index de15ed668..bedd74222 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1142,6 +1142,7 @@ dependencies = [ "p256 0.14.0", "rand 0.10.3", "regex", + "reqwest 0.12.28", "reqwest 0.13.5", "resolvematrix", "ruma", @@ -2717,10 +2718,10 @@ dependencies = [ "hyper", "hyper-util", "rustls", + "rustls-native-certs", "tokio", "tokio-rustls", "tower-service", - "webpki-roots", ] [[package]] @@ -4840,8 +4841,8 @@ dependencies = [ "log", "percent-encoding", "pin-project-lite", - "quinn", "rustls", + "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", @@ -4856,7 +4857,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", ] [[package]] @@ -7111,15 +7111,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "weezl" version = "0.1.12" diff --git a/Cargo.toml b/Cargo.toml index 176aa0038..fa8b5aa5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,6 +166,15 @@ features = [ "form", ] +# Needed for as long as openidconnect is on an outdated reqwest +[workspace.dependencies.reqwest_0_12] +package = "reqwest" +version = "0.12" +default-features = false +features = [ + "rustls-tls-native-roots-no-provider", +] + [workspace.dependencies.serde] version = "1.0.229" default-features = false @@ -414,6 +423,8 @@ default-features = false [workspace.dependencies.openidconnect] version = "4.1.0" +default-features = false +features = ["reqwest"] # optional opentelemetry, performance measurements, flamegraphs, etc for performance measurements and monitoring [workspace.dependencies.opentelemetry] diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index 394076898..8cc5c2975 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -105,11 +105,12 @@ http3 = [ "reqwest/http3" ] ring = [ - "rustls/ring" + "rustls/ring", ] + aws_lc_rs = [ "rustls/aws_lc_rs", - "dep:aws-lc-rs" + "dep:aws-lc-rs", ] io_uring = [ "conduwuit-database/io_uring", diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 60a362608..6ff782c69 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -122,6 +122,8 @@ lettre.workspace = true resolvematrix.workspace = true serde_urlencoded.workspace = true openidconnect.workspace = true +# This is here to set features on the outdated openidconnect reqwest +reqwest_0_12.workspace = true rand.workspace = true [target.'cfg(all(unix, target_os = "linux"))'.dependencies]