actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-09-02 09:36:40 +02:00
Code Issues Releases Wiki Activity

merge -connect and -tls and upgrade to rt v2 (#238)

Browse Source
This commit is contained in:
Rob Ede
2020-12-29 00:38:41 +00:00
committed by GitHub
parent 3c6de3a81b
commit 5759c9e144
24 changed files with 212 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
actix-tls/Cargo.toml
View File

@@ -2,8 +2,8 @@
name = "actix-tls"
version = "2.0.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "TLS acceptor services for Actix ecosystem."
keywords = ["network", "framework", "async", "tls", "ssl"]
description = "TLS acceptor and connector services for Actix ecosystem"
keywords = ["network", "tls", "ssl", "async", "transport"]
homepage = "https://actix.rs"
repository = "https://github.com/actix/actix-net.git"
documentation = "https://docs.rs/actix-tls/"
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
edition = "2018"
[package.metadata.docs.rs]
features = ["openssl", "rustls", "nativetls"]
features = ["openssl", "rustls", "native-tls", "accept", "connect", "http"]
[lib]
name = "actix_tls"
@@ -20,45 +20,59 @@ path = "src/lib.rs"
[[example]]
name = "basic"
required-features = ["rustls"]
required-features = ["accept", "rustls"]
[features]
default = []
default = ["accept", "connect", "http"]
# openssl
openssl = ["open-ssl", "tokio-openssl"]
# enable acceptor services
accept = []
# rustls
rustls = ["rust-tls", "webpki", "webpki-roots", "tokio-rustls"]
# enable connector services
connect = []
# nativetls
nativetls = ["native-tls", "tokio-tls"]
# use openssl impls
openssl = ["tls-openssl", "tokio-openssl"]
# use rustls impls
rustls = ["tls-rustls", "webpki", "webpki-roots", "tokio-rustls"]
# use native-tls impls
native-tls = ["tls-native-tls", "tokio-native-tls"]
[dependencies]
actix-service = "1.0.0"
actix-codec = "0.3.0"
actix-utils = "2.0.0"
actix-codec = "0.4.0-beta.1"
actix-rt = "2.0.0-beta.1"
actix-service = "2.0.0-beta.1"
actix-utils = "3.0.0-beta.1"
futures-util = { version = "0.3.4", default-features = false }
derive_more = "0.99.5"
either = "1.6"
futures-util = { version = "0.3.7", default-features = false }
http = { version = "0.2.0", optional = true }
log = "0.4"
trust-dns-proto = { version = "0.19", default-features = false, features = ["tokio-runtime"] }
trust-dns-resolver = { version = "0.19", default-features = false, features = ["tokio-runtime", "system-config"] }
# openssl
open-ssl = { package = "openssl", version = "0.10", optional = true }
tokio-openssl = { version = "0.4.0", optional = true }
tls-openssl = { package = "openssl", version = "0.10", optional = true }
tokio-openssl = { version = "0.6", optional = true }
# TODO: Reduce dependencies where tokio wrappers re-export base crate.
# rustls
rust-tls = { package = "rustls", version = "0.18.0", optional = true }
tls-rustls = { package = "rustls", version = "0.19", optional = true }
tokio-rustls = { version = "0.22", optional = true }
webpki = { version = "0.21", optional = true }
webpki-roots = { version = "0.20", optional = true }
tokio-rustls = { version = "0.14.0", optional = true }
webpki-roots = { version = "0.21", optional = true }
# native-tls
native-tls = { version = "0.2", optional = true }
tokio-tls = { version = "0.3", optional = true }
tls-native-tls = { package = "native-tls", version = "0.2", optional = true }
tokio-native-tls = { version = "0.3", optional = true }
[dev-dependencies]
bytes = "0.5"
log = "0.4"
env_logger = "0.7"
actix-testing = "2.0.0-beta.1"
actix-server = "2.0.0-beta.1"
actix-rt = "1"
actix-testing = "2.0.0-beta.1"
bytes = "1"
log = "0.4"
env_logger = "0.8"