Skip to content

Commit acb7405

Browse files
committed
fix: correct aws rustls v0.23 feature gating
1 parent 9a437fe commit acb7405

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

actix-http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ rand = { version = "0.8", optional = true }
115115
sha1 = { version = "0.10", optional = true }
116116

117117
# openssl/rustls
118-
actix-tls = { version = "3.3", default-features = false, optional = true }
118+
actix-tls = { version = "3.4", default-features = false, optional = true }
119119

120120
# compress-*
121121
brotli = { version = "6", optional = true }

actix-web/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ actix-rt = { version = "2.6", default-features = false }
9292
actix-server = "2"
9393
actix-service = "2"
9494
actix-utils = "3"
95-
actix-tls = { version = "3.3", default-features = false, optional = true }
95+
actix-tls = { version = "3.4", default-features = false, optional = true }
9696

9797
actix-http = { version = "3.7", features = ["ws"] }
9898
actix-router = { version = "0.5", default-features = false, features = ["http"] }

awc/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ actix-codec = "0.5"
8383
actix-service = "2"
8484
actix-http = { version = "3.7", features = ["http2", "ws"] }
8585
actix-rt = { version = "2.1", default-features = false }
86-
actix-tls = { version = "3.3", features = ["connect", "uri"] }
86+
actix-tls = { version = "3.4", features = ["connect", "uri"] }
8787
actix-utils = "3"
8888

8989
base64 = "0.22"
@@ -120,7 +120,7 @@ actix-http = { version = "3.7", features = ["openssl"] }
120120
actix-http-test = { version = "3", features = ["openssl"] }
121121
actix-server = "2"
122122
actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] }
123-
actix-tls = { version = "3.3", features = ["openssl", "rustls-0_23"] }
123+
actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23"] }
124124
actix-utils = "3"
125125
actix-web = { version = "4", features = ["openssl"] }
126126

awc/src/client/connector.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ impl Connector<()> {
131131

132132
OurTlsConnector::Rustls023(std::sync::Arc::new(config))
133133
}
134-
135134
} else if #[cfg(any(feature = "rustls-0_22-webpki-roots", feature = "rustls-0_22-native-roots"))] {
136135
/// Build TLS connector with Rustls v0.22, based on supplied ALPN protocols.
137136
fn build_tls(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
@@ -743,6 +742,9 @@ where
743742
feature = "rustls-0_21",
744743
feature = "rustls-0_22-webpki-roots",
745744
feature = "rustls-0_22-native-roots",
745+
feature = "rustls-0_23",
746+
feature = "rustls-0_23-webpki-roots",
747+
feature = "rustls-0_23-native-roots"
746748
))]
747749
struct TlsConnectorService<Tcp, Tls> {
748750
/// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
@@ -761,6 +763,7 @@ struct TlsConnectorService<Tcp, Tls> {
761763
feature = "rustls-0_21",
762764
feature = "rustls-0_22-webpki-roots",
763765
feature = "rustls-0_22-native-roots",
766+
feature = "rustls-0_23",
764767
))]
765768
impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls>
766769
where

0 commit comments

Comments
 (0)