Skip to content

Commit 77b9268

Browse files
committed
Get rid of aws-lc-rs as a dependency.
1 parent 2692928 commit 77b9268

5 files changed

Lines changed: 28 additions & 143 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ pretty_assertions = "1.4"
122122
ratatui = { version = "0.30", default-features = false }
123123
regex = "1"
124124
rlimit = "0.11"
125+
rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12"] }
126+
hyper-rustls = { version = "0.27", default-features = false, features = ["ring", "http1", "http2", "tls12"] }
127+
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] }
125128
scopeguard = "1.2"
126129
serde = "1.0"
127130
serde_json = "1.0"
@@ -150,6 +153,9 @@ task-maker-exec = { path = "./task-maker-exec" }
150153
task-maker-lang = { path = "./task-maker-lang" } # needed only by typescriptify
151154
task-maker-format = { path = "./task-maker-format" }
152155

156+
# Crypto provider for rustls
157+
rustls = { workspace = true }
158+
153159
# Logging and setting up the global logger
154160
log = { workspace = true }
155161
env_logger = { workspace = true }

src/main.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,13 @@
187187
#![allow(clippy::type_complexity)]
188188

189189
use clap::Parser;
190-
191-
use task_maker_rust::main_local;
192-
use task_maker_rust::opt;
190+
use task_maker_rust::{main_local, opt};
193191

194192
fn main() {
193+
rustls::crypto::ring::default_provider()
194+
.install_default()
195+
.expect("Failed to install rustls crypto provider");
196+
195197
let mut opt = opt::Opt::parse();
196198
opt.enable_log();
197199
main_local(opt);

src/tools/main.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use clap::Parser;
2-
32
use task_maker_rust::error::NiceError;
43
use task_maker_rust::tools::add_solution_checks::main_add_solution_checks;
54
use task_maker_rust::tools::booklet::main_booklet;
@@ -19,6 +18,10 @@ use task_maker_rust::tools::terry_statement::main_terry_statement;
1918
use task_maker_rust::tools::worker::main_worker;
2019

2120
fn main() {
21+
rustls::crypto::ring::default_provider()
22+
.install_default()
23+
.expect("Failed to install rustls crypto provider");
24+
2225
let base_opt = Opt::parse();
2326
base_opt.logger.enable_log();
2427

task-maker-exec/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ crossbeam-channel = { workspace = true }
4040
typst = "0.14.2"
4141
time = "0.3.47"
4242
typst-pdf = "0.14.2"
43-
reqwest = { version = "0.13.2", features = ["blocking"] }
43+
reqwest = { version = "0.13.2", default-features = false, features = ["blocking", "rustls-no-provider", "charset", "http2", "system-proxy"] }
44+
rustls = { workspace = true }
45+
hyper-rustls = { workspace = true }
46+
tokio-rustls = { workspace = true }
4447
zune-inflate = "0.2.54"
4548
tar = "0.4.44"
4649
typst-assets = "0.14.2"

0 commit comments

Comments
 (0)