Skip to content

Commit 3687001

Browse files
committed
Revert "Fix build on openssl-setup feature"
This reverts commit 77b306e.
1 parent 77b306e commit 3687001

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ chrono = "0.4.38"
2424
rustix = { version = "1", features = ["process", "stdio"] }
2525
libc = "0.2.159"
2626
reqwest = { version = "0.13", default-features = false }
27+
rustls-platform-verifier = { version = "0.6", optional = true }
2728
rustls = { version = "0.23", default-features = false, features = ["ring", "tls12"], optional = true }
2829
tracing = "0.1.40"
2930
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
@@ -81,8 +82,8 @@ aosc = ["dep:oma-topics", "oma-refresh/aosc", "oma-pm/aosc", "oma-contents/aosc"
8182
sequoia-openssl-backend = ["oma-refresh/sequoia-openssl-backend"]
8283
sequoia-nettle-backend = ["oma-refresh/sequoia-nettle-backend"]
8384
tokio-console = ["dep:console-subscriber"]
84-
rustls = ["reqwest/rustls-no-provider", "dep:rustls", "oma-fetch/rustls", "oma-refresh/rustls", "oma-topics/rustls"]
85-
openssl = ["reqwest/native-tls", "reqwest/http2", "oma-fetch/native-tls", "oma-refresh/native-tls", "oma-topics/native-tls"]
85+
rustls = ["reqwest/rustls-no-provider", "dep:rustls-platform-verifier", "dep:rustls", "oma-fetch/rustls", "oma-refresh/rustls", "oma-topics/rustls"]
86+
openssl = ["reqwest/native-tls", "oma-fetch/native-tls", "oma-refresh/native-tls", "oma-topics/native-tls"]
8687
nice-setup = ["sequoia-nettle-backend", "rustls", "oma-refresh/apt"]
8788
openssl-setup = ["sequoia-openssl-backend", "openssl", "oma-refresh/apt"]
8889
default = ["aosc", "nice-setup"]

oma-fetch/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ flume = "0.12"
3333

3434
[features]
3535
rustls = ["reqwest/rustls-no-provider", "dep:rustls"]
36-
native-tls = ["reqwest/native-tls", "reqwest/http2"]
36+
native-tls = ["reqwest/native-tls"]
3737
default = ["rustls"]

oma-topics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ tokio = { version = "1.28", default-features = false, features = ["macros", "rt-
2727

2828
[features]
2929
rustls = ["reqwest/rustls-no-provider", "dep:rustls"]
30-
native-tls = ["reqwest/native-tls", "reqwest/http2"]
30+
native-tls = ["reqwest/native-tls"]
3131
default = ["rustls"]

src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ fn try_main(
482482
/// Initialize ring TLS config for HTTP client
483483
#[inline]
484484
fn init_tls_config() {
485-
#[cfg(feature = "rustls")]
486485
rustls::crypto::ring::default_provider()
487486
.install_default()
488487
.expect("Failed to install rustls crypto provider");

0 commit comments

Comments
 (0)