diff --git a/Cargo.lock b/Cargo.lock index 631e52393e6cc..3bf62fb906abf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -805,7 +805,7 @@ dependencies = [ "rand", "regex", "ring 0.17.5", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "rustls-pemfile 1.0.4", "rustls-webpki 0.101.7", @@ -817,7 +817,7 @@ dependencies = [ "time", "tokio", "tokio-retry", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing", "url", ] @@ -1252,11 +1252,11 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper-rustls", "once_cell", "pin-project-lite", "pin-utils", - "rustls 0.21.8", + "rustls", "tokio", "tracing", ] @@ -4561,7 +4561,7 @@ dependencies = [ "async-trait", "dyn-clone", "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper-rustls", "log", "reqwest 0.11.27", "serde", @@ -5131,28 +5131,11 @@ dependencies = [ "http 0.2.9", "hyper 0.14.27", "log", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", - "webpki-roots 0.25.2", -] - -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http 1.0.0", - "hyper 1.2.0", - "hyper-util", - "rustls 0.22.3", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.25.0", - "tower-service", + "tokio-rustls", + "webpki-roots", ] [[package]] @@ -8742,7 +8725,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -8752,7 +8735,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "rustls-pemfile 1.0.4", "serde", @@ -8762,7 +8745,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -8770,7 +8753,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -8783,7 +8766,6 @@ dependencies = [ "base64 0.21.7", "bytes", "encoding_rs", - "futures-channel", "futures-core", "futures-util", "h2 0.4.3", @@ -8791,7 +8773,6 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.2.0", - "hyper-rustls 0.26.0", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -8802,9 +8783,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.3", "rustls-pemfile 1.0.4", - "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -8812,13 +8791,11 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.25.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.26.1", "winreg", ] @@ -9524,7 +9501,7 @@ dependencies = [ "time", "tokio-postgres", "tokio-retry", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-stream", "tokio-util", "tracing", @@ -10147,7 +10124,7 @@ dependencies = [ "fail", "futures", "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls 0.5.0", "itertools 0.12.0", "madsim", @@ -10156,7 +10133,7 @@ dependencies = [ "opendal", "prometheus", "risingwave_common", - "rustls 0.21.8", + "rustls", "spin 0.9.8", "thiserror", "thiserror-ext", @@ -10703,7 +10680,7 @@ dependencies = [ "rustls-webpki 0.100.3", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "url", ] @@ -10846,20 +10823,6 @@ dependencies = [ "sct", ] -[[package]] -name = "rustls" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" -dependencies = [ - "log", - "ring 0.17.5", - "rustls-pki-types", - "rustls-webpki 0.102.2", - "subtle", - "zeroize", -] - [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -10917,17 +10880,6 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "rustls-webpki" -version = "0.102.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" -dependencies = [ - "ring 0.17.5", - "rustls-pki-types", - "untrusted 0.9.0", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -12807,18 +12759,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.8", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.3", - "rustls-pki-types", + "rustls", "tokio", ] @@ -12973,16 +12914,16 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.1", - "rustls 0.21.8", + "rustls", "rustls-pemfile 1.0.4", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-stream", "tower", "tower-layer", "tower-service", "tracing", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -14035,15 +13976,6 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "which" version = "4.4.2" @@ -14568,6 +14500,7 @@ dependencies = [ "regex", "regex-automata 0.4.5", "regex-syntax 0.8.2", + "reqwest 0.11.27", "reqwest 0.12.2", "ring 0.16.20", "rust_decimal", @@ -14680,11 +14613,11 @@ dependencies = [ "futures", "http 0.2.9", "hyper 0.14.27", - "hyper-rustls 0.24.2", + "hyper-rustls", "itertools 0.10.5", "log", "percent-encoding", - "rustls 0.21.8", + "rustls", "rustls-pemfile 1.0.4", "seahash", "serde", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 9930e959582b1..81be87a377399 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -112,7 +112,8 @@ redis = { version = "0.25", features = ["async-std-comp", "tokio-comp"] } regex = { version = "1" } regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] } regex-syntax = { version = "0.8" } -reqwest = { version = "0.12", features = ["blocking", "json", "rustls-tls"] } +reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12", features = ["json"] } +reqwest-a6292c17cd707f01 = { package = "reqwest", version = "0.11", default-features = false, features = ["blocking", "default-tls", "json", "rustls-tls"] } ring = { version = "0.16", features = ["std"] } rust_decimal = { version = "1", features = ["db-postgres", "maths"] } rustc-hash = { version = "1" }