Upgrade tokio-rustls & webpki. (#570)

Now that we're on tokio-0.2, we can upgrade tokio-rustls.

I've moved an updated webpki fork into the linkerd organization.

Author: olix0r

Cargo.lock

@@ -2880,9 +2880,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4adb8b3e5f86b707f1b54e7c15b6de52617a823608ccda98a15d3a24222f265a"
+checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4"
 dependencies = [
  "futures-core",
  "rustls",
@@ -3579,8 +3579,8 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.21.0"
-source = "git+https://github.com/seanmonstar/webpki?branch=cert-dns-names-0.21#c4d77fd78a48a5daf05fd7ce2c18d34f9a077e4a"
+version = "0.21.2"
+source = "git+https://github.com/linkerd/webpki?branch=cert-dns-names-0.21#bb241f5bf80a894d0899ad6719bab3d9d0660b61"
 dependencies = [
  "ring",
  "untrusted",

Cargo.toml

@@ -63,7 +63,7 @@ debug = false
 debug = false
 
 [patch.crates-io]
-webpki = { git = "https://github.com/seanmonstar/webpki", branch = "cert-dns-names-0.21" }
+webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21" }
 # backport danburkert/prost#268 to `prost` 0.5 temporarily.
 prost = { git = "https://github.com/linkerd/prost", branch = "v0.5.x" }
 tower = { version = "0.3", git = "https://github.com/tower-rs/tower", rev = "8752a3811788e94670c62dc0acbc9613207931b1"}

linkerd/app/Cargo.toml

@@ -46,4 +46,4 @@ tokio-connect = { git = "https://github.com/carllerche/tokio-connect" }
 tokio-io = "0.1.6"
 tokio-current-thread = "0.1.4"
 tokio-rustls = "0.13"
-webpki = "=0.21.0"
+webpki = "0.21"

linkerd/app/integration/Cargo.toml

@@ -51,7 +51,7 @@ tonic = { version = "0.2", default-features = false }
 tracing = "0.1.9"
 tracing-futures = { version = "0.2", features = ["std-future"] }
 tracing-subscriber = "0.2.5"
-webpki = "=0.21.0"
+webpki = "0.21.0"
 
 [dev-dependencies]
 flate2 = { version = "1.0.1", default-features = false, features = ["rust_backend"] }

linkerd/dns/name/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2018"
 publish = false
 
 [dependencies]
-webpki = "=0.21.0"
+webpki = "0.21"
 untrusted = "0.7"