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

feat(tls): rustls-0_22 create feature

Browse Source
This commit is contained in:
Rob Ede 2024-02-03 16:39:21 +00:00
parent a1ae524512
commit e427911cdb
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-rt/src/lib.rs
View File

@ -34,6 +34,7 @@
//! ``` //! ```
//! //!
//! # `io-uring` Support //! # `io-uring` Support
//!
//! There is experimental support for using io-uring with this crate by enabling the //! There is experimental support for using io-uring with this crate by enabling the
//! `io-uring` feature. For now, it is semver exempt. //! `io-uring` feature. For now, it is semver exempt.
//! //!

2
actix-tls/CHANGES.md
View File

@ -2,6 +2,8 @@
## Unreleased ## Unreleased
- Add `rustls-0_22` create feature which excludes any root certificate methods or re-exports.
## 3.2.0 ## 3.2.0
- Support Rustls v0.22. - Support Rustls v0.22.

5
actix-tls/Cargo.toml
View File

@ -57,8 +57,9 @@ rustls-0_21-webpki-roots = ["tokio-rustls-024", "webpki-roots-025"]
rustls-0_21-native-roots = ["tokio-rustls-024", "dep:rustls-native-certs-06"] rustls-0_21-native-roots = ["tokio-rustls-024", "dep:rustls-native-certs-06"]
# use rustls v0.22 impls # use rustls v0.22 impls
rustls-0_22-webpki-roots = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1", "dep:webpki-roots-026"] rustls-0_22 = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1"]
rustls-0_22-native-roots = ["dep:tokio-rustls-025", "dep:rustls-pki-types-1", "dep:rustls-native-certs-07"] rustls-0_22-webpki-roots = ["rustls-0_22", "dep:webpki-roots-026"]
rustls-0_22-native-roots = ["rustls-0_22", "dep:rustls-native-certs-07"]
# use native-tls impls # use native-tls impls
native-tls = ["dep:tokio-native-tls"] native-tls = ["dep:tokio-native-tls"]

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

@ -22,10 +22,7 @@ pub use rustls_0_20 as rustls;
#[cfg(feature = "rustls-0_21")] #[cfg(feature = "rustls-0_21")]
pub mod rustls_0_21; pub mod rustls_0_21;
#[cfg(any( #[cfg(feature = "rustls-0_22")]
feature = "rustls-0_22-webpki-roots",
feature = "rustls-0_22-native-roots",
))]
pub mod rustls_0_22; pub mod rustls_0_22;
#[cfg(feature = "native-tls")] #[cfg(feature = "native-tls")]
@ -37,8 +34,7 @@ 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",
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 =