From f2fd3a434d8cb8085bb9cfb9fce80e5ef3755129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20P=C3=BCschel?= Date: Sun, 6 Oct 2024 18:24:02 +0200 Subject: [PATCH 1/2] fix: remove `aws-lc-sys` hard-dependency Remove hard-dependency on `aws-lc-sys` by adding two new features: `rustls-ring` and `rustls-aws-lc-rs`. By default, `rustls-aws-lc-rs` is enabled (which is also a default feature for `hyper-rustls`), but the dependency on aws-lc-rs can be overriden by consumers of the library. Refs: #706 --- Cargo.toml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3d9a28c4..799901b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,12 @@ http = "1.0.0" http-body = "1.0.0" http-body-util = "0.1.0" hyper = "1.1.0" -hyper-rustls = { version = "0.27.0", optional = true } +hyper-rustls = { version = "0.27.0", optional = true, default-features = false, features = [ + "http1", + "logging", + "native-tokio", + "tls12", +]} hyper-timeout = { version = "0.5.1", optional = true } hyper-tls = { version = "0.6.0", optional = true } hyper-util = { version = "0.1.3", features = ["http1"] } @@ -71,11 +76,13 @@ pretty_assertions = "1.4.0" graphql_client = "0.14.0" [features] -default = ["follow-redirect", "retry", "rustls", "timeout", "tracing", "default-client"] +default = ["follow-redirect", "retry", "rustls", "timeout", "tracing", "default-client", "rustls-aws-lc-rs"] follow-redirect = ["tower-http/follow-redirect"] retry = ["tower/retry", "futures-util"] rustls = ["hyper-rustls"] +rustls-ring = ["hyper-rustls/ring"] +rustls-aws-lc-rs = ["hyper-rustls/aws-lc-rs"] rustls-webpki-tokio = ["hyper-rustls/webpki-tokio"] opentls = ["hyper-tls"] stream = ["futures-core", "futures-util"] From be9ed7630055127cd2324b7a3f239b3cb6504bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20P=C3=BCschel?= Date: Sun, 6 Oct 2024 19:54:51 +0200 Subject: [PATCH 2/2] fix: use `rustls-ring` feature by default --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 799901b8..4a1c74ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ pretty_assertions = "1.4.0" graphql_client = "0.14.0" [features] -default = ["follow-redirect", "retry", "rustls", "timeout", "tracing", "default-client", "rustls-aws-lc-rs"] +default = ["follow-redirect", "retry", "rustls", "timeout", "tracing", "default-client", "rustls-ring"] follow-redirect = ["tower-http/follow-redirect"] retry = ["tower/retry", "futures-util"]