Skip to content

Commit 728d0ef

Browse files
authored
refactor: deprecate aws-lc-rs (#521)
1 parent e8dcfb6 commit 728d0ef

6 files changed

Lines changed: 19 additions & 22 deletions

File tree

compio-quic/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ native-certs = ["dep:rustls-native-certs"]
7070
webpki-roots = ["dep:webpki-roots"]
7171
h3 = ["dep:h3", "dep:h3-datagram"]
7272
ring = ["quinn-proto/rustls-ring"]
73-
aws-lc-rs = ["quinn-proto/rustls-aws-lc-rs"]
74-
aws-lc-rs-fips = ["aws-lc-rs", "quinn-proto/rustls-aws-lc-rs-fips"]
73+
74+
# Deprecated Features
75+
aws-lc-rs = []
76+
aws-lc-rs-fips = []
7577

7678
[[example]]
7779
name = "http3-client"

compio-quic/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ fn main() {
1111
bsd: { any(freebsd, non_freebsd) },
1212
solarish: { any(target_os = "illumos", target_os = "solaris") },
1313
apple: { target_vendor = "apple" },
14-
rustls: { any(feature = "aws-lc-rs", feature = "ring") }
14+
rustls: { any(feature = "ring") }
1515
}
1616
}

compio-quic/src/builder.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ mod verifier {
239239
rustls::crypto::CryptoProvider::get_default()
240240
.map(|provider| provider.signature_verification_algorithms)
241241
.unwrap_or_else(|| {
242-
#[cfg(feature = "aws-lc-rs")]
243-
use rustls::crypto::aws_lc_rs::default_provider;
244-
#[cfg(all(not(feature = "aws-lc-rs"), feature = "ring"))]
242+
#[cfg(feature = "ring")]
245243
use rustls::crypto::ring::default_provider;
246244
default_provider().signature_verification_algorithms
247245
}),

compio-tls/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ all = ["native-tls", "rustls"]
4949
rustls = ["dep:rustls", "dep:futures-rustls", "dep:futures-util"]
5050

5151
ring = ["rustls", "rustls/ring", "futures-rustls/ring"]
52-
aws-lc-rs = ["rustls", "rustls/aws-lc-rs", "futures-rustls/aws-lc-rs"]
53-
aws-lc-rs-fips = ["aws-lc-rs", "rustls/fips", "futures-rustls/fips"]
5452

5553
read_buf = ["compio-buf/read_buf", "compio-io/read_buf", "rustls?/read_buf"]
5654
nightly = ["read_buf"]
55+
56+
# Deprecated Features
57+
aws-lc-rs = []
58+
aws-lc-rs-fips = []

compio-ws/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
3636

3737
[features]
3838
default = []
39-
# Deprecated
40-
connect = []
4139
native-tls = ["compio-tls/native-tls", "tungstenite/native-tls"]
4240
rustls = ["compio-tls/rustls", "tungstenite/__rustls-tls"]
4341
rustls-platform-verifier = ["rustls", "dep:rustls-platform-verifier"]
4442
rustls-native-certs = ["rustls", "dep:rustls-native-certs"]
4543
webpki-roots = ["rustls", "dep:webpki-roots"]
4644
ring = ["compio-tls/ring"]
47-
aws-lc-rs = ["compio-tls/aws-lc-rs"]
48-
aws-lc-rs-fips = ["compio-tls/aws-lc-rs-fips"]
45+
46+
# Deprecated Features
47+
connect = []
48+
aws-lc-rs = []
49+
aws-lc-rs-fips = []

compio/Cargo.toml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,10 @@ criterion = ["compio-runtime?/criterion"]
118118
enable_log = ["compio-log/enable_log"]
119119

120120
ring = ["compio-tls?/ring", "compio-quic?/ring", "compio-ws?/ring"]
121-
aws-lc-rs = [
122-
"compio-tls?/aws-lc-rs",
123-
"compio-quic?/aws-lc-rs",
124-
"compio-ws?/aws-lc-rs",
125-
]
126-
aws-lc-rs-fips = [
127-
"compio-tls?/aws-lc-rs-fips",
128-
"compio-quic?/aws-lc-rs-fips",
129-
"compio-ws?/aws-lc-rs-fips",
130-
]
121+
122+
# Deprecated Features
123+
aws-lc-rs = []
124+
aws-lc-rs-fips = []
131125

132126
# Nightly features
133127
allocator_api = ["compio-buf/allocator_api", "compio-io?/allocator_api"]

0 commit comments

Comments
 (0)