micropelago/tokio-rustls
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20 from ctz/master

Browse Source 
Update dependencies
This commit is contained in:
quininer 2018-07-15 22:34:53 +08:00 committed by GitHub
commit 508dbb95a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.6.0" version = "0.7.0"
authors = ["quininer kel <quininer@live.com>"] authors = ["quininer kel <quininer@live.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
repository = "https://github.com/quininer/tokio-rustls" repository = "https://github.com/quininer/tokio-rustls"
@ -18,8 +18,8 @@ appveyor = { repository = "quininer/tokio-rustls" }
futures-core = { version = "0.2.0", optional = true } futures-core = { version = "0.2.0", optional = true }
futures-io = { version = "0.2.0", optional = true } futures-io = { version = "0.2.0", optional = true }
tokio = { version = "0.1.6", optional = true } tokio = { version = "0.1.6", optional = true }
rustls = "0.12" rustls = "0.13"
webpki = "0.18.0-alpha" webpki = "0.18.1"
[dev-dependencies] [dev-dependencies]
# futures = "0.2.0" # futures = "0.2.0"

6
examples/client/Cargo.toml
View File

@ -4,14 +4,14 @@ version = "0.1.0"
authors = ["quininer <quininer@live.com>"] authors = ["quininer <quininer@live.com>"]
[dependencies] [dependencies]
rustls = "0.12" rustls = "0.13"
webpki = "0.18.0-alpha" webpki = "0.18.1"
tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] } tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] }
tokio = "0.1" tokio = "0.1"
clap = "2.26" clap = "2.26"
webpki-roots = "0.14" webpki-roots = "0.15"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
tokio-file-unix = "0.5" tokio-file-unix = "0.5"

2
examples/server/Cargo.toml
View File

@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["quininer <quininer@live.com>"] authors = ["quininer <quininer@live.com>"]
[dependencies] [dependencies]
rustls = "0.12" rustls = "0.13"
tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] } tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] }
tokio = { version = "0.1.6" } tokio = { version = "0.1.6" }

3
examples/server/src/main.rs
View File

@ -45,7 +45,8 @@ fn main() {
let flag_echo = matches.occurrences_of("echo") > 0; let flag_echo = matches.occurrences_of("echo") > 0;
let mut config = ServerConfig::new(NoClientAuth::new()); let mut config = ServerConfig::new(NoClientAuth::new());
config.set_single_cert(load_certs(cert_file), load_keys(key_file).remove(0)); config.set_single_cert(load_certs(cert_file), load_keys(key_file).remove(0))
.expect("invalid key or certificate");
let arc_config = Arc::new(config); let arc_config = Arc::new(config);
let socket = TcpListener::bind(&addr).unwrap(); let socket = TcpListener::bind(&addr).unwrap();

3
tests/test.rs
View File

@ -26,7 +26,8 @@ fn start_server(cert: Vec<Certificate>, rsa: PrivateKey) -> SocketAddr {
use tokio::io as aio; use tokio::io as aio;
let mut config = ServerConfig::new(rustls::NoClientAuth::new()); let mut config = ServerConfig::new(rustls::NoClientAuth::new());
config.set_single_cert(cert, rsa); config.set_single_cert(cert, rsa)
.expect("invalid key or certificate");
let config = Arc::new(config); let config = Arc::new(config);
let (send, recv) = channel(); let (send, recv) = channel();