Skip to content

Commit 7ed4c85

Browse files
authored
fix: add rustls features for tls (#336)
* fix: add rustls features for tls * ci(linux): add ring if no default features
1 parent 8e9d097 commit 7ed4c85

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.github/workflows/ci_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ jobs:
2626
- os: "ubuntu-22.04"
2727
features: "io-uring-sqe128,io-uring-cqe32,io-uring-socket"
2828
- os: "ubuntu-20.04"
29-
features: "polling"
29+
features: "polling,ring"
3030
no_default_features: true
3131
- os: "ubuntu-22.04"
32-
features: "polling"
32+
features: "polling,ring"
3333
no_default_features: true
3434
- os: "ubuntu-20.04"
35-
features: "polling,native-tls"
35+
features: "polling,native-tls,ring"
3636
no_default_features: true
3737
- os: "ubuntu-22.04"
38-
features: "polling,native-tls"
38+
features: "polling,native-tls,ring"
3939
no_default_features: true
4040
- os: "windows-latest"
4141
target: "x86_64-pc-windows-msvc"

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ compio-dispatcher = { path = "./compio-dispatcher", version = "0.4.0" }
3737
compio-log = { path = "./compio-log", version = "0.1.0" }
3838
compio-tls = { path = "./compio-tls", version = "0.3.0", default-features = false }
3939
compio-process = { path = "./compio-process", version = "0.2.0" }
40-
compio-quic = { path = "./compio-quic", version = "0.1.0" }
40+
compio-quic = { path = "./compio-quic", version = "0.1.0", default-features = false }
4141

4242
bytes = "1.7.1"
4343
flume = "0.11.0"

compio-tls/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@ default = ["native-tls"]
3838
all = ["native-tls", "rustls"]
3939
rustls = ["dep:rustls"]
4040

41+
ring = ["rustls", "rustls/ring"]
42+
aws-lc-rs = ["rustls", "rustls/aws-lc-rs"]
43+
aws-lc-rs-fips = ["aws-lc-rs", "rustls/fips"]
44+
4145
read_buf = ["compio-buf/read_buf", "compio-io/read_buf", "rustls?/read_buf"]
4246
nightly = ["read_buf"]

compio/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ libc = { workspace = true }
7676
monoio = { version = "0.2.2", default-features = false, features = ["iouring"] }
7777

7878
[features]
79-
default = ["runtime", "io-uring"]
79+
default = ["runtime", "io-uring", "ring"]
8080
io-uring = [
8181
"compio-driver/io-uring",
8282
"compio-fs?/io-uring",
@@ -117,6 +117,10 @@ criterion = ["compio-runtime?/criterion"]
117117

118118
enable_log = ["compio-log/enable_log"]
119119

120+
ring = ["compio-tls?/ring", "compio-quic?/ring"]
121+
aws-lc-rs = ["compio-tls?/aws-lc-rs", "compio-quic?/aws-lc-rs"]
122+
aws-lc-rs-fips = ["compio-tls?/aws-lc-rs-fips", "compio-quic?/aws-lc-rs-fips"]
123+
120124
# Nightly features
121125
allocator_api = ["compio-buf/allocator_api", "compio-io?/allocator_api"]
122126
lazy_cell = ["compio-signal?/lazy_cell"]

0 commit comments

Comments
 (0)