Skip to content

Commit fe7ca0d

Browse files
committed
refactor: move from aws-lc to ring
1 parent c4766ce commit fe7ca0d

4 files changed

Lines changed: 12 additions & 178 deletions

File tree

.github/workflows/test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ jobs:
170170
- name: Checkout code
171171
uses: actions/checkout@v5
172172

173-
# hyper-rustls >=0.27 uses aws-lc as default backend which requires NASM to build
174-
- name: Install NASM
175-
uses: ilammy/[email protected]
176-
177173
- name: Install toolchain
178174
run: curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
179175

Cargo.lock

Lines changed: 6 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ uuid = { version = "1", default-features = false, features = ["v4"] }
7777
data-encoding = "2.9"
7878
flate2 = "1.1"
7979
protobuf-json-mapping = "3.7"
80-
rustls = { version = "0.23", features = ["aws-lc-rs"] }
80+
rustls = { version = "0.23", default-features = false, features = [
81+
"ring",
82+
] }
8183

8284
# Eventually, this should use rustls-platform-verifier to unify the platform-specific dependencies
8385
# but currently, hyper-proxy2 and tokio-tungstenite do not support it.
@@ -86,7 +88,7 @@ hyper-proxy2 = { version = "0.1", default-features = false, features = [
8688
"rustls",
8789
] }
8890
hyper-rustls = { version = "0.27", default-features = false, features = [
89-
"aws-lc-rs",
91+
"ring",
9092
"http1",
9193
"logging",
9294
"tls12",
@@ -102,7 +104,7 @@ hyper-proxy2 = { version = "0.1", default-features = false, features = [
102104
"rustls-webpki",
103105
] }
104106
hyper-rustls = { version = "0.27", default-features = false, features = [
105-
"aws-lc-rs",
107+
"ring",
106108
"http1",
107109
"logging",
108110
"tls12",

core/src/http_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl HttpClient {
145145

146146
fn try_create_hyper_client(proxy_url: Option<&Url>) -> Result<HyperClient, Error> {
147147
// configuring TLS is expensive and should be done once per process
148-
let _ = rustls::crypto::aws_lc_rs::default_provider()
148+
let _ = rustls::crypto::ring::default_provider()
149149
.install_default()
150150
.map_err(|e| {
151151
Error::internal(format!("unable to install default crypto provider: {e:?}"))

0 commit comments

Comments
 (0)