Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hyper-rustls: add ring Rustls backend & use it by default #140

Merged
merged 6 commits into from
Sep 4, 2024
Merged

hyper-rustls: add ring Rustls backend & use it by default #140

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f56282
use rustls ring backend by default
blind-oracle Sep 4, 2024
fad1be7
comment
blind-oracle Sep 4, 2024
3efa7ce
bump rust version, init crypto provider explicitly
blind-oracle Sep 4, 2024
a228d44
bump ci to rust 1.70.0
blind-oracle Sep 4, 2024
52d41ee
fix features
blind-oracle Sep 4, 2024
e2e7a48
fix cfg again
blind-oracle Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ homepage = "https://clickhouse.com"
license = "MIT OR Apache-2.0"
readme = "README.md"
edition = "2021"
rust-version = "1.67.0" # update `derive/Cargo.toml` and CI if changed
# update `derive/Cargo.toml` and CI if changed
rust-version = "1.67.0"
serprex marked this conversation as resolved.
Show resolved Hide resolved

[lints.rust]
rust_2018_idioms = { level = "warn", priority = -1 }
Expand Down Expand Up @@ -57,7 +58,8 @@ uuid = ["dep:uuid"]
time = ["dep:time"]
lz4 = ["dep:lz4_flex", "dep:cityhash-rs"]
native-tls = ["dep:hyper-tls"]
rustls-tls = ["dep:hyper-rustls"]
rustls-tls = ["dep:hyper-rustls", "hyper-rustls?/ring"]
rustls-tls-aws = ["dep:hyper-rustls", "hyper-rustls?/aws-lc-rs"]

[dependencies]
clickhouse-derive = { version = "0.2.0", path = "derive" }
Expand All @@ -70,15 +72,23 @@ http-body-util = "0.1.2"
hyper = "1.4"
hyper-util = { version = "0.1.6", features = ["client-legacy", "http1"] }
hyper-tls = { version = "0.6.0", optional = true }
hyper-rustls = { version = "0.27.2", features = ["webpki-roots"], optional = true }
hyper-rustls = { version = "0.27.2", default-features = false, features = [
"http1",
"http2",
loyd marked this conversation as resolved.
Show resolved Hide resolved
"native-tokio",
loyd marked this conversation as resolved.
Show resolved Hide resolved
"tls12",
"webpki-roots",
], optional = true }
url = "2.1.1"
futures = "0.3.5"
futures-channel = "0.3.30"
static_assertions = "1.1"
sealed = "0.5"
sha-1 = { version = "0.10", optional = true }
serde_json = { version = "1.0.68", optional = true }
lz4_flex = { version = "0.11.3", default-features = false, features = ["std"], optional = true }
lz4_flex = { version = "0.11.3", default-features = false, features = [
"std",
], optional = true }
cityhash-rs = { version = "=1.0.1", optional = true } # exact version for safety
uuid = { version = "1", optional = true }
time = { version = "0.3", optional = true }
Expand Down
Loading