Skip to content

Commit 10e49bd

Browse files
do not compile aws-lc-rs by default
1 parent ec5e397 commit 10e49bd

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/rust.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ jobs:
6464
- uses: Swatinem/rust-cache@v2
6565
# Prevent feature unification from selecting *ring* as the crypto provider
6666
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn-proto/Cargo.toml --no-default-features --features rustls-aws-lc-rs
67-
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn/Cargo.toml --no-default-features --features rustls-aws-lc-rs,runtime-tokio
67+
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn/Cargo.toml --no-default-features --features rustls-aws-lc-rs,runtime-tokio,__rustls-post-quantum-test
6868
# FIPS
6969
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn-proto/Cargo.toml --no-default-features --features rustls-aws-lc-rs-fips
70-
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn/Cargo.toml --no-default-features --features rustls-aws-lc-rs-fips,runtime-tokio
70+
- run: RUST_BACKTRACE=1 cargo test --manifest-path quinn/Cargo.toml --no-default-features --features rustls-aws-lc-rs-fips,__rustls-post-quantum-test,runtime-tokio
7171

7272
msrv:
7373
runs-on: ubuntu-latest
@@ -174,7 +174,7 @@ jobs:
174174
env:
175175
RUSTFLAGS: -Dwarnings
176176
# skip FIPS features outside of Linux
177-
SKIP_FEATURES: ${{ matrix.os != 'ubuntu-latest' && 'rustls-aws-lc-rs-fips,aws-lc-rs-fips' || '' }}
177+
SKIP_FEATURES: ${{ matrix.os != 'ubuntu-latest' && 'rustls-aws-lc-rs-fips,aws-lc-rs-fips,__rustls-post-quantum-test' || '' }}
178178
steps:
179179
- uses: actions/checkout@v4
180180
- uses: dtolnay/rust-toolchain@stable

quinn/Cargo.toml

+7-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ runtime-smol = ["async-io", "smol"]
3939
# Configure `tracing` to log events via `log` if no `tracing` subscriber exists.
4040
log = ["tracing/log", "proto/log", "udp/log"]
4141

42+
# Internal (PRIVATE!) features used to aid testing.
43+
# Don't rely on these whatsoever. They may disappear at any time.
44+
45+
__rustls-post-quantum-test = ["dep:rustls-post-quantum", "rustls-aws-lc-rs"]
46+
4247
[dependencies]
4348
async-io = { workspace = true, optional = true }
4449
async-std = { workspace = true, optional = true }
@@ -49,6 +54,7 @@ rustc-hash = { workspace = true }
4954
pin-project-lite = { workspace = true }
5055
proto = { package = "quinn-proto", path = "../quinn-proto", version = "0.11.7", default-features = false }
5156
rustls = { workspace = true, optional = true }
57+
rustls-post-quantum = { workspace = true, optional = true }
5258
smol = { workspace = true, optional = true }
5359
socket2 = { workspace = true }
5460
thiserror = { workspace = true }
@@ -64,7 +70,6 @@ directories-next = { workspace = true }
6470
rand = { workspace = true }
6571
rcgen = { workspace = true }
6672
rustls-pemfile = { workspace = true }
67-
rustls-post-quantum = { workspace = true }
6873
clap = { workspace = true }
6974
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "time", "macros"] }
7075
tracing-subscriber = { workspace = true }
@@ -93,7 +98,7 @@ required-features = ["rustls-ring"]
9398

9499
[[test]]
95100
name = "post_quantum"
96-
required-features = ["rustls-aws-lc-rs"]
101+
required-features = ["__rustls-post-quantum-test"]
97102

98103
[[bench]]
99104
name = "bench"

0 commit comments

Comments
 (0)