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

Merge pull request #14 from briansmith/bump-deps

Browse Source 
0.4.0: Use rustls 0.11, webpki-roots 0.13, and update other deps.
This commit is contained in:
quininer 2017-08-30 00:55:56 -05:00 committed by GitHub
commit 42f877f994
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.3.1" version = "0.4.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,15 +18,15 @@ appveyor = { repository = "quininer/tokio-rustls" }
danger = [ "rustls/dangerous_configuration" ] danger = [ "rustls/dangerous_configuration" ]
[dependencies] [dependencies]
futures = "0.1" futures = "0.1.15"
tokio-io = "0.1" tokio-io = "0.1.3"
rustls = "0.10" rustls = "0.11"
tokio-proto = { version = "0.1", optional = true } tokio-proto = { version = "0.1.1", optional = true }
[dev-dependencies] [dev-dependencies]
tokio-core = "0.1" tokio-core = "0.1.9"
clap = "2.20" clap = "2.26"
webpki-roots = "0.12" webpki-roots = "0.13"
[target.'cfg(unix)'.dev-dependencies] [target.'cfg(unix)'.dev-dependencies]
tokio-file-unix = "0.4" tokio-file-unix = "0.4"

2
README.md
View File

@ -18,7 +18,7 @@ use tokio_rustls::ClientConfigExt;
// ... // ...
let mut config = ClientConfig::new(); let mut config = ClientConfig::new();
config.root_store.add_trust_anchors(&webpki_roots::ROOTS); config.root_store.add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
let config = Arc::new(config); let config = Arc::new(config);
TcpStream::connect(&addr, &handle) TcpStream::connect(&addr, &handle)

2
examples/client.rs
View File

@ -64,7 +64,7 @@ fn main() {
let mut pem = BufReader::new(fs::File::open(cafile).unwrap()); let mut pem = BufReader::new(fs::File::open(cafile).unwrap());
config.root_store.add_pem_file(&mut pem).unwrap(); config.root_store.add_pem_file(&mut pem).unwrap();
} else { } else {
config.root_store.add_trust_anchors(&webpki_roots::ROOTS); config.root_store.add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
} }
let arc_config = Arc::new(config); let arc_config = Arc::new(config);