Skip to content

Commit 4f44a84

Browse files
authored
Merge pull request #172 from Berrysoft/update-rustls
feat(tls): update rustls to 0.22
2 parents 4bad8c7 + f9da6e8 commit 4f44a84

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

compio-tls/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@ compio-buf = { workspace = true }
1919
compio-io = { workspace = true, features = ["compat"] }
2020

2121
native-tls = { version = "0.2.11", optional = true }
22-
rustls = { version = "=0.22.0-alpha.6", optional = true }
23-
rustls-pki-types = { version = "0.2.3", optional = true }
22+
rustls = { version = "0.22.1", optional = true }
2423

2524
[dev-dependencies]
2625
compio-net = { workspace = true }
2726
compio-runtime = { workspace = true }
2827
compio-macros = { workspace = true }
2928

30-
rustls-native-certs = "=0.7.0-alpha.3"
29+
rustls-native-certs = "0.7.0"
3130

3231
[features]
3332
default = ["native-tls"]
3433
all = ["native-tls", "rustls"]
35-
rustls = ["dep:rustls", "dep:rustls-pki-types"]
34+
rustls = ["dep:rustls"]
3635

3736
read_buf = ["compio-buf/read_buf", "compio-io/read_buf", "rustls?/read_buf"]
3837
nightly = ["read_buf"]

compio-tls/src/adapter/rtls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::{io, ops::DerefMut, sync::Arc};
22

33
use compio_io::{compat::SyncStream, AsyncRead, AsyncWrite};
44
use rustls::{
5-
ClientConfig, ClientConnection, ConnectionCommon, Error, ServerConfig, ServerConnection,
5+
pki_types::ServerName, ClientConfig, ClientConnection, ConnectionCommon, Error, ServerConfig,
6+
ServerConnection,
67
};
7-
use rustls_pki_types::ServerName;
88

99
use crate::TlsStream;
1010

compio-tls/tests/connect.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ async fn rtls() {
3535

3636
let connector = TlsConnector::from(Arc::new(
3737
rustls::ClientConfig::builder()
38-
.with_safe_defaults()
3938
.with_root_certificates(store)
4039
.with_no_client_auth(),
4140
));

0 commit comments

Comments
 (0)