actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-23 22:51:07 +01:00
Code Issues Releases Wiki Activity

chore(tls): fix feature flagging of DEFAULT_TLS_HANDSHAKE_TIMEOUT

Browse Source
This commit is contained in:
Rob Ede 2023-12-16 00:43:02 +00:00
parent 02ac0bb4f7
commit c5b2d0cd36
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-tls/src/accept/mod.rs
View File

@ -37,6 +37,8 @@ pub(crate) static MAX_CONN: AtomicUsize = AtomicUsize::new(256);
feature = "openssl", feature = "openssl",
feature = "rustls-0_20", feature = "rustls-0_20",
feature = "rustls-0_21", feature = "rustls-0_21",
feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots",
feature = "native-tls", feature = "native-tls",
))] ))]
pub(crate) const DEFAULT_TLS_HANDSHAKE_TIMEOUT: std::time::Duration = pub(crate) const DEFAULT_TLS_HANDSHAKE_TIMEOUT: std::time::Duration =

6
actix-tls/src/accept/rustls_0_20.rs
View File

@ -23,7 +23,7 @@ use actix_utils::{
}; };
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
use tokio_rustls::{rustls::ServerConfig, Accept, TlsAcceptor}; use tokio_rustls::{Accept, TlsAcceptor};
use tokio_rustls_023 as tokio_rustls; use tokio_rustls_023 as tokio_rustls;
use super::{TlsError, DEFAULT_TLS_HANDSHAKE_TIMEOUT, MAX_CONN_COUNTER}; use super::{TlsError, DEFAULT_TLS_HANDSHAKE_TIMEOUT, MAX_CONN_COUNTER};
@ -92,13 +92,13 @@ impl<IO: ActixStream> ActixStream for TlsStream<IO> {
/// Accept TLS connections via the `rustls` crate. /// Accept TLS connections via the `rustls` crate.
pub struct Acceptor { pub struct Acceptor {
config: Arc<ServerConfig>, config: Arc<reexports::ServerConfig>,
handshake_timeout: Duration, handshake_timeout: Duration,
} }
impl Acceptor { impl Acceptor {
/// Constructs `rustls` based acceptor service factory. /// Constructs `rustls` based acceptor service factory.
pub fn new(config: ServerConfig) -> Self { pub fn new(config: reexports::ServerConfig) -> Self {
Acceptor { Acceptor {
config: Arc::new(config), config: Arc::new(config),
handshake_timeout: DEFAULT_TLS_HANDSHAKE_TIMEOUT, handshake_timeout: DEFAULT_TLS_HANDSHAKE_TIMEOUT,

6
actix-tls/src/accept/rustls_0_21.rs
View File

@ -23,7 +23,7 @@ use actix_utils::{
}; };
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
use tokio_rustls::{rustls::ServerConfig, Accept, TlsAcceptor}; use tokio_rustls::{Accept, TlsAcceptor};
use tokio_rustls_024 as tokio_rustls; use tokio_rustls_024 as tokio_rustls;
use super::{TlsError, DEFAULT_TLS_HANDSHAKE_TIMEOUT, MAX_CONN_COUNTER}; use super::{TlsError, DEFAULT_TLS_HANDSHAKE_TIMEOUT, MAX_CONN_COUNTER};
@ -92,13 +92,13 @@ impl<IO: ActixStream> ActixStream for TlsStream<IO> {
/// Accept TLS connections via the `rustls` crate. /// Accept TLS connections via the `rustls` crate.
pub struct Acceptor { pub struct Acceptor {
config: Arc<ServerConfig>, config: Arc<reexports::ServerConfig>,
handshake_timeout: Duration, handshake_timeout: Duration,
} }
impl Acceptor { impl Acceptor {
/// Constructs `rustls` based acceptor service factory. /// Constructs `rustls` based acceptor service factory.
pub fn new(config: ServerConfig) -> Self { pub fn new(config: reexports::ServerConfig) -> Self {
Acceptor { Acceptor {
config: Arc::new(config), config: Arc::new(config),
handshake_timeout: DEFAULT_TLS_HANDSHAKE_TIMEOUT, handshake_timeout: DEFAULT_TLS_HANDSHAKE_TIMEOUT,