colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update rustls to 0.15

Browse Source 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2019-01-22 10:14:56 +01:00 committed by Benjamin Fry
parent d9d9bdc35c
commit e2f98dc0f1
12 changed files with 91 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Cargo.lock generated
View File

@ -76,6 +76,14 @@ dependencies = [
"safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "base64"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bitflags"
version = "1.0.4"
@ -363,7 +371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -788,7 +796,7 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.1.50"
version = "0.1.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -796,7 +804,7 @@ name = "redox_termios"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -838,7 +846,7 @@ dependencies = [
[[package]]
name = "ring"
version = "0.13.5"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
@ -873,15 +881,15 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.14.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
"sct 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
"sct 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -905,10 +913,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "sct"
version = "0.4.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -981,7 +989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1047,7 +1055,7 @@ dependencies = [
"cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
"remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1066,7 +1074,7 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1092,7 +1100,7 @@ version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
"redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1195,13 +1203,13 @@ dependencies = [
[[package]]
name = "tokio-rustls"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1306,15 +1314,15 @@ dependencies = [
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"radix_trie 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"trust-dns-https 0.3.0",
"trust-dns-proto 0.7.0",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1342,17 +1350,17 @@ dependencies = [
"h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"trust-dns-proto 0.7.0",
"trust-dns-rustls 0.6.0",
"typed-headers 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki-roots 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1367,7 +1375,7 @@ dependencies = [
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1379,7 +1387,7 @@ dependencies = [
"trust-dns-resolver 0.11.0-alpha.1",
"trust-dns-rustls 0.6.0",
"trust-dns-server 0.16.0-alpha.1",
"webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki-roots 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1421,7 +1429,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
"socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1449,7 +1457,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1461,7 +1469,7 @@ dependencies = [
"trust-dns-openssl 0.6.0",
"trust-dns-proto 0.7.0",
"trust-dns-rustls 0.6.0",
"webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki-roots 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1471,12 +1479,12 @@ dependencies = [
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"trust-dns-proto 0.7.0",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1498,7 +1506,7 @@ dependencies = [
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1506,7 +1514,7 @@ dependencies = [
"tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-rustls 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1569,8 +1577,11 @@ dependencies = [
[[package]]
name = "unicode-normalization"
version = "0.1.7"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unicode-width"
@ -1637,20 +1648,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "webpki"
version = "0.18.1"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "webpki-roots"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1738,6 +1749,7 @@ dependencies = [
"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum byteorder 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60f0b0d4c0a382d2734228fd12b5a6b5dac185c60e938026fd31b265b94f9bd2"
@ -1824,21 +1836,21 @@ dependencies = [
"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
"checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
"checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
"checksum ring 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "891fc6d2e7a5ddd0ddf2fb24badc38a37f3d1f84642483dcf72be158f5bf78d9"
"checksum rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6381ddfe91dbb659b4b132168da15985bc84162378cf4fcdc4eb99c857d063e2"
"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7891791343c75b73ed9a18cadcafd8c8563d11a88ebe2d87f5b8a3182654d9"
"checksum rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "658a37e5aa4f69d50c5b1fff01cff75551be9576cedcadb63df97f7ddbb16d5f"
"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
"checksum sct 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb8f61f9e6eadd062a71c380043d28036304a4706b3c4dd001ff3387ed00745a"
"checksum sct 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f5adf8fbd58e1b1b52699dc8bed2630faecb6d8c7bee77d009d6bbe4af569b9"
"checksum security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05"
"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc"
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
@ -1869,7 +1881,7 @@ dependencies = [
"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
"checksum tokio-openssl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771d6246b170ae108d67d9963c23f31a579016c016d73bd4bd7d6ef0252afda7"
"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
"checksum tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04a5c8de3797c207c574495724eb77ded1a150160a2db0936c751bf49003c84e"
"checksum tokio-rustls 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7223fa02f4b2d9f3736f13cc3dea3723aaec57ca4b3dded922126ebbb2cb8ce9"
"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
@ -1881,7 +1893,7 @@ dependencies = [
"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
@ -1893,8 +1905,8 @@ dependencies = [
"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
"checksum webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "17d7967316d8411ca3b01821ee6c332bde138ba4363becdb492f12e514daa17f"
"checksum webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85d1f408918fd590908a70d36b7ac388db2edc221470333e4d6e5b598e44cabf"
"checksum webpki 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e757213fe5c8064919ce0e069556de90a7c684df37016976e05022081cb05d"
"checksum webpki-roots 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c10fa4212003ba19a564f25cd8ab572c6791f99a03cc219c13ed35ccab00de0e"
"checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"

6
crates/client/Cargo.toml
View File

@ -74,15 +74,15 @@ log = "^0.4.1"
openssl = { version = "^0.10", features = ["v102", "v110"], optional = true }
radix_trie = "0.1.2"
rand = "0.6"
ring = { version = "0.13", features = ["rsa_signing"], optional = true }
rustls = { version = "0.14", optional = true }
ring = { version = "0.14", optional = true }
rustls = { version = "0.15", optional = true }
serde = { version = "1.0", optional = true }
tokio = "^0.1.6"
tokio-tcp = "^0.1"
trust-dns-https = {version = "0.3.0", path = "../https", optional = true }
trust-dns-proto = {version = "0.7.0", path = "../proto", features = ["dnssec"]}
untrusted = { version = "^0.6", optional = true }
webpki = { version = "0.18", optional = true }
webpki = { version = "0.19", optional = true }
[dev-dependencies]
openssl = { version = "^0.10", features = ["v102", "v110"], optional = false }

8
crates/client/src/error/dnssec_error.rs
View File

@ -27,7 +27,7 @@ use self::not_ring::Unspecified;
#[cfg(feature = "openssl")]
use openssl::error::ErrorStack as SslErrorStack;
#[cfg(feature = "ring")]
use ring::error::Unspecified;
use ring::error::{KeyRejected, Unspecified};
use proto::error::{ProtoError, ProtoErrorKind};
/// An alias for dnssec results returned by functions of this crate
@ -142,6 +142,12 @@ impl From<ProtoError> for Error {
}
}
impl From<KeyRejected> for Error {
fn from(e: KeyRejected) -> Error {
e.context(ErrorKind::Ring).into()
}
}
impl From<Unspecified> for Error {
fn from(e: Unspecified) -> Error {
e.context(ErrorKind::Ring).into()

6
crates/client/src/rr/dnssec/keypair.rs
View File

@ -24,7 +24,7 @@ use openssl::sign::Signer;
#[cfg(feature = "ring")]
use ring::rand;
#[cfg(feature = "ring")]
use ring::signature::Ed25519KeyPair;
use ring::signature::{Ed25519KeyPair, KeyPair as RingKeyPair};
use error::*;
#[cfg(any(feature = "openssl", feature = "ring"))]
@ -146,7 +146,7 @@ impl<K: HasPublic> KeyPair<K> {
Ok(bytes)
}
#[cfg(feature = "ring")]
KeyPair::ED25519(ref ed_key) => Ok(ed_key.public_key_bytes().to_vec()),
KeyPair::ED25519(ref ed_key) => Ok(ed_key.public_key().as_ref().to_vec()),
#[cfg(not(feature = "openssl"))]
KeyPair::Phantom(..) => panic!("Phantom disallowed"),
#[cfg(not(any(feature = "openssl", feature = "ring")))]
@ -464,7 +464,7 @@ impl KeyPair<Private> {
let rng = rand::SystemRandom::new();
Ed25519KeyPair::generate_pkcs8(&rng)
.map_err(|e| e.into())
.map(|pkcs8_bytes| pkcs8_bytes.to_vec())
.map(|pkcs8_bytes| pkcs8_bytes.as_ref().to_vec())
}
#[cfg(not(all(feature = "openssl", feature = "ring")))]
_ => Err(DnsSecErrorKind::Message("openssl nor ring feature(s) not enabled").into()),

8
crates/https/Cargo.toml
View File

@ -51,17 +51,17 @@ futures = "0.1.17"
h2 = "0.1"
http = "0.1"
log = "0.4"
rustls = "0.14"
rustls = "0.15"
tokio-executor = "0.1.4"
tokio-reactor = "0.1"
tokio-rustls = "0.8"
tokio-rustls = "0.9"
tokio-tcp = "0.1"
# disables default features, i.e. openssl...
trust-dns-proto = { version = "0.7.0", path = "../proto", default-features = false }
trust-dns-rustls = { version = "0.6.0", path = "../rustls", default-features = false }
typed-headers = "0.1"
webpki-roots = { version = "0.15" }
webpki = "0.18"
webpki-roots = { version = "0.16" }
webpki = "0.19"
[dev-dependencies]
env_logger = "^0.6"

4
crates/https/src/https_client_stream.rs
View File

@ -28,7 +28,7 @@ use trust_dns_proto::xfer::{DnsRequest, DnsRequestSender, DnsResponse, SerialMes
use HttpsError;
const ALPN_H2: &str = "h2";
const ALPN_H2: &[u8] = b"h2";
/// A DNS client connection for DNS-over-HTTPS
#[derive(Clone)]
@ -416,7 +416,7 @@ impl HttpsClientStreamBuilder {
/// * `loop_handle` - The reactor Core handle
pub fn build(self, name_server: SocketAddr, dns_name: String) -> HttpsClientConnect {
let mut client_config = self.client_config;
client_config.alpn_protocols.push(ALPN_H2.to_owned());
client_config.alpn_protocols.push(ALPN_H2.to_vec());
let tls = TlsConfig {
client_config: Arc::new(client_config),

2
crates/proto/Cargo.toml
View File

@ -62,7 +62,7 @@ lazy_static = "^1.0"
log = "^0.4.1"
openssl = { version = "^0.10", features = ["v102", "v110"], optional = true }
rand = "0.6"
ring = { version = "0.13.2", features = ["rsa_signing"], optional = true }
ring = { version = "0.14", optional = true }
serde = { version = "1.0", optional = true }
smallvec = "^0.6"
socket2 = { version = "^0.3.4", features = ["reuseport"] }

4
crates/resolver/Cargo.toml
View File

@ -66,7 +66,7 @@ lazy_static = "^1.0"
log = "^0.4.1"
lru-cache = "^0.1.1"
resolv-conf = { version = "0.6.0", features = ["system"] }
rustls = {version = "0.14", optional = true}
rustls = {version = "0.15", optional = true}
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }
smallvec = "^0.6"
@ -77,7 +77,7 @@ trust-dns-native-tls = { version = "0.6.0", path = "../native-tls", optional = t
trust-dns-openssl = { version = "0.6.0", path = "../openssl", optional = true }
trust-dns-proto = { version = "0.7.0", path = "../proto" }
trust-dns-rustls = { version = "0.6.0", path = "../rustls", optional = true }
webpki-roots = { version = "^0.15", optional = true }
webpki-roots = { version = "^0.16", optional = true }
[target.'cfg(windows)'.dependencies]
ipconfig = { version = "^0.1.7" }

6
crates/rustls/Cargo.toml
View File

@ -46,12 +46,12 @@ path = "src/lib.rs"
[dependencies]
futures = "^0.1.17"
log = "^0.4.1"
rustls = "0.14"
tokio-rustls = "0.8"
rustls = "0.15"
tokio-rustls = "0.9"
tokio-tcp = "^0.1"
# disables default features, i.e. openssl...
trust-dns-proto = { version = "0.7.0", path = "../proto", default-features = false }
webpki = "0.18"
webpki = "0.19"
[dev-dependencies]
openssl = { version = "0.10", features = ["v102", "v110"] }

2
crates/rustls/src/tls_server.rs
View File

@ -63,7 +63,7 @@ pub fn new_acceptor(
key: PrivateKey,
) -> Result<ServerConfig, rustls::TLSError> {
let mut config = ServerConfig::new(rustls::NoClientAuth::new());
config.set_protocols(&["h2".to_string()]);
config.set_protocols(&[b"h2".to_vec()]);
config.set_single_cert(cert, key)?;
Ok(config)

6
crates/server/Cargo.toml
View File

@ -86,7 +86,7 @@ log = "0.4.1"
openssl = { version = "0.10", features = ["v102", "v110"], optional = true }
rand = "0.6"
rusqlite = { version = "0.16.0", features = ["bundled"] }
rustls = { version = "0.14", optional = true }
rustls = { version = "0.15", optional = true }
serde = "1.0.34"
serde_derive = "1.0.34"
time = "0.1"
@ -94,7 +94,7 @@ tokio = "0.1.6"
tokio-executor = "0.1.4"
tokio-io = "0.1"
tokio-reactor = "0.1"
tokio-rustls = { version = "0.8", optional = true }
tokio-rustls = { version = "0.9", optional = true }
tokio-tcp = "0.1"
tokio-timer = "0.2.6"
tokio-udp = "0.1"
@ -108,4 +108,4 @@ trust-dns-rustls = { version = "0.6.0", path = "../rustls", optional = true }
[dev-dependencies]
native-tls = "0.2"
trust-dns-native-tls = { version = "0.6.0", path = "../native-tls" }
tokio-tls = "0.2"
tokio-tls = "0.2"

4
tests/integration-tests/Cargo.toml
View File

@ -72,7 +72,7 @@ futures = "0.1.17"
openssl = { version = "^0.10", features = ["v102", "v110"] }
rand = "0.6"
rusqlite = { version = "0.16.0", features = ["bundled"] }
rustls = { version = "0.14" }
rustls = { version = "0.15" }
tokio = "0.1.6"
tokio-tcp = "0.1"
tokio-timer = "0.2.6"
@ -85,4 +85,4 @@ trust-dns-resolver = { version = "0.11.0-alpha", path = "../../crates/resolver"
trust-dns-rustls = { version = "0.6.0", path = "../../crates/rustls" }
# TODO: fixup tests to not require openssl
trust-dns-server = { version = "0.16.0-alpha", path = "../../crates/server" }
webpki-roots = { version = "0.15", optional = true }
webpki-roots = { version = "0.16", optional = true }